From 503b923618e3bd61f90b7dd1b5211872e3aea7d2 Mon Sep 17 00:00:00 2001
From: Stephen Gordon <sgordon@redhat.com>
Date: Tue, 17 Sep 2013 15:43:27 -0400
Subject: [PATCH] Use openstack.org git infrastructure for samples.

Updated guides to use the openstack.org git infrastructure for
retrieving sample files from the various OpenStack projects. This
prevents sporadic github outages breaking the guide builds.

Change-Id: Ic637899d2bfa4da1d64b26ef35792d9607458c51
---
 doc/admin-guide-cloud/ch_compute.xml                    | 2 +-
 doc/common/section_keystone-sample-conf-files.xml       | 6 +++---
 doc/config-reference/ch_objectstorageconfigure.xml      | 8 ++++----
 doc/install-guide/section_identity-install-keystone.xml | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc/admin-guide-cloud/ch_compute.xml b/doc/admin-guide-cloud/ch_compute.xml
index 9284e92ded..87237a9ce3 100644
--- a/doc/admin-guide-cloud/ch_compute.xml
+++ b/doc/admin-guide-cloud/ch_compute.xml
@@ -1771,7 +1771,7 @@ qualname = nova</programlisting></para>
                 including the meaning of the <literal>handlers
                 </literal>and <literal>quaname</literal> variables.
                 See <link
-                    xlink:href="https://github.com/openstack/nova/blob/master/etc/nova/logging_sample.conf"
+                    xlink:href="http://git.openstack.org/cgit/openstack/nova/plain/etc/nova/logging_sample.conf"
                     >etc/nova/logging_sample.conf</link> in the
                 openstack/nova repository on GitHub for an example
                 logging.conf file with various handlers
diff --git a/doc/common/section_keystone-sample-conf-files.xml b/doc/common/section_keystone-sample-conf-files.xml
index 145af795a9..30985ceed3 100644
--- a/doc/common/section_keystone-sample-conf-files.xml
+++ b/doc/common/section_keystone-sample-conf-files.xml
@@ -11,19 +11,19 @@
             <para>
                 <filename>etc/keystone.conf.sample</filename>
             </para><para>
-                <programlisting language="ini"><xi:include parse="text" href="https://raw.github.com/openstack/keystone/master/etc/keystone.conf.sample"></xi:include></programlisting></para>
+                <programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/keystone/plain/etc/keystone.conf.sample"></xi:include></programlisting></para>
         </listitem>
         <listitem>
             <para>
                 <filename>etc/keystone-paste.ini</filename>
             </para><para>
-                <programlisting language="ini"><xi:include parse="text" href="https://raw.github.com/openstack/keystone/master/etc/keystone-paste.ini"></xi:include></programlisting></para>
+                <programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/keystone/plain/etc/keystone-paste.ini"></xi:include></programlisting></para>
         </listitem>
         <listitem>
             <para>
                 <literal>etc/logging.conf.sample</literal>
             </para>
-            <para><programlisting language="ini"><xi:include parse="text" href="https://raw.github.com/openstack/keystone/master/etc/logging.conf.sample"/></programlisting></para>
+            <para><programlisting language="ini"><xi:include parse="text" href="http://git.openstack.org/cgit/openstack/keystone/plain/etc/logging.conf.sample"/></programlisting></para>
         </listitem>
     </itemizedlist>
 </section>
diff --git a/doc/config-reference/ch_objectstorageconfigure.xml b/doc/config-reference/ch_objectstorageconfigure.xml
index e75687cb12..ca72e51c65 100644
--- a/doc/config-reference/ch_objectstorageconfigure.xml
+++ b/doc/config-reference/ch_objectstorageconfigure.xml
@@ -28,7 +28,7 @@
         <xi:include href="../common/tables/swift-object-server-filter-recon.xml"/>
     <section xml:id="object-server-conf">
         <title>Sample Object Server configuration file</title>
-        <programlisting><xi:include parse="text"  href="https://raw.github.com/openstack/swift/master/etc/object-server.conf-sample"/></programlisting></section>
+        <programlisting><xi:include parse="text"  href="http://git.openstack.org/cgit/openstack/swift/plain/etc/object-server.conf-sample"/></programlisting></section>
     </section>
         <section xml:id="container-server-configuration">
             <title>Container Server Configuration</title>
@@ -46,7 +46,7 @@
             <xi:include href="../common/tables/swift-container-server-filter-recon.xml"/>
    <section xml:id="container-server-conf">
         <title>Sample Container Server configuration file</title>
-        <programlisting language="ini"><xi:include parse="text"  href="https://raw.github.com/openstack/swift/master/etc/container-server.conf-sample"/></programlisting></section>
+        <programlisting language="ini"><xi:include parse="text"  href="http://git.openstack.org/cgit/openstack/swift/plain/etc/container-server.conf-sample"/></programlisting></section>
 
         </section>
         <section xml:id="account-server-configuration">
@@ -65,7 +65,7 @@
             <xi:include href="../common/tables/swift-account-server-filter-recon.xml"/>
     <section xml:id="account-server-conf">
         <title>Sample Account Server configuration file</title>
-        <programlisting language="ini"><xi:include parse="text"  href="https://raw.github.com/openstack/swift/master/etc/account-server.conf-sample"/></programlisting></section>
+        <programlisting language="ini"><xi:include parse="text"  href="http://git.openstack.org/cgit/openstack/swift/plain/etc/account-server.conf-sample"/></programlisting></section>
         </section>
         <section xml:id="proxy-server-configuration">
             <title>Proxy Server Configuration</title>
@@ -86,7 +86,7 @@
             <xi:include href="../common/tables/swift-proxy-server-filter-tempauth.xml"/>
     <section xml:id="proxy-server-conf">
         <title>Sample Proxy Server configuration file</title>
-        <programlisting language="ini"><xi:include parse="text"  href="https://raw.github.com/openstack/swift/master/etc/proxy-server.conf-sample"/></programlisting></section>
+        <programlisting language="ini"><xi:include parse="text"  href="http://git.openstack.org/cgit/openstack/swift/plain/etc/proxy-server.conf-sample"/></programlisting></section>
     </section>
 
 <!-- section on Object Storage Features -->
diff --git a/doc/install-guide/section_identity-install-keystone.xml b/doc/install-guide/section_identity-install-keystone.xml
index 775bfe7bc9..f00a818a72 100644
--- a/doc/install-guide/section_identity-install-keystone.xml
+++ b/doc/install-guide/section_identity-install-keystone.xml
@@ -664,8 +664,8 @@ driver = keystone.catalog.backends.sql.Catalog</programlisting>
         Scripted</title>
       <para>The Keystone project offers a bash script for populating
         tenants, users, roles and services at <link
-          xlink:href="https://github.com/openstack/keystone/blob/master/tools/sample_data.sh"
-          >https://github.com/openstack/keystone/blob/master/tools/sample_data.sh</link>
+          xlink:href="http://git.openstack.org/cgit/openstack/keystone/plain/tools/sample_data.sh"
+          >http://git.openstack.org/cgit/openstack/keystone/plain/tools/sample_data.sh</link>
         with sample data. This script uses 127.0.0.1 for all endpoint
         IP addresses. This script also defines services for you.</para>
     </section>