From 7d6ed4d0c9dfbf97bdf99aa450228d69116dbb2e Mon Sep 17 00:00:00 2001
From: Andreas Jaeger <aj@suse.com>
Date: Tue, 29 Dec 2015 19:25:22 +0100
Subject: [PATCH] Use git.openstack.org everywhere

Our official git master is at git.openstack.org, update places
that use github instead.

Change-Id: I6377e765f05a494a3f7aae96cc76dff60a67a41e
---
 .../drivers/windows-iscsi-volume-driver.rst        |  2 +-
 .../source/compute/hypervisor-hyper-v.rst          |  2 +-
 .../source/compute/hypervisor-xen-api.rst          | 14 +++++++-------
 .../source/create-images-automatically.rst         |  2 +-
 doc/networking-guide/source/adv_config_qos.rst     |  2 +-
 tools/README-USE-openstack-doc-tools.txt           |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/doc/config-reference/source/block-storage/drivers/windows-iscsi-volume-driver.rst b/doc/config-reference/source/block-storage/drivers/windows-iscsi-volume-driver.rst
index 8be40a2743..505f9a4d03 100644
--- a/doc/config-reference/source/block-storage/drivers/windows-iscsi-volume-driver.rst
+++ b/doc/config-reference/source/block-storage/drivers/windows-iscsi-volume-driver.rst
@@ -80,7 +80,7 @@ Once installed, run the following to clone the OpenStack Block Storage code:
 
 .. code-block:: none
 
-   PS C:\> git.exe clone https://github.com/openstack/cinder.git
+   PS C:\> git.exe clone https://git.openstack.org/openstack/cinder
 
 Configure cinder-volume
 ~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/doc/config-reference/source/compute/hypervisor-hyper-v.rst b/doc/config-reference/source/compute/hypervisor-hyper-v.rst
index 9d473634c6..170559a0c5 100644
--- a/doc/config-reference/source/compute/hypervisor-hyper-v.rst
+++ b/doc/config-reference/source/compute/hypervisor-hyper-v.rst
@@ -308,7 +308,7 @@ Download the nova code
 
    .. code-block:: powershell
 
-      PS C:\> git.exe clone https://github.com/openstack/nova.git
+      PS C:\> git.exe clone https://git.openstack.org/openstack/nova
 
 Install nova-compute service
 ----------------------------
diff --git a/doc/config-reference/source/compute/hypervisor-xen-api.rst b/doc/config-reference/source/compute/hypervisor-xen-api.rst
index 586fb729cd..fcf6638a5a 100644
--- a/doc/config-reference/source/compute/hypervisor-xen-api.rst
+++ b/doc/config-reference/source/compute/hypervisor-xen-api.rst
@@ -242,18 +242,18 @@ version the following procedure can be used.
 
    .. code-block:: console
 
-      $ NOVA_ZIPBALL=$(mktemp)
+      $ NOVA_TARBALL=$(mktemp)
       $ NOVA_SOURCES=$(mktemp -d)
 
-#. Get the source from GitHub. The example assumes the master branch
-   is used, and the XenServer host is accessible as xenserver.
-   Match those parameters to your setup.
+#. Get the source from the openstack.org archives. The example assumes
+   the master branch is used, and the XenServer host is accessible as
+   xenserver. Match those parameters to your setup.
 
    .. code-block:: console
 
-      $ NOVA_URL=https://github.com/openstack/nova/archive/master.zip
-      $ wget -qO "$NOVA_ZIPBALL" "$NOVA_URL"
-      $ unzip "$NOVA_ZIPBALL" -d "$NOVA_SOURCES"
+      $ NOVA_URL=https://tarballs.openstack.org/nova/nova-master.tar.gz
+      $ wget -qO "$NOVA_TARBALL" "$NOVA_URL"
+      $ tar xvf "$NOVA_TARBALL" -d "$NOVA_SOURCES"
 
 #. Copy the plug-ins to the hypervisor:
 
diff --git a/doc/image-guide/source/create-images-automatically.rst b/doc/image-guide/source/create-images-automatically.rst
index 362c818199..5921ff8501 100644
--- a/doc/image-guide/source/create-images-automatically.rst
+++ b/doc/image-guide/source/create-images-automatically.rst
@@ -32,7 +32,7 @@ variables or adding elements to the command-line:
 
 This example creates the image as before, but for arm architecture.
 More elements are available in the `git source directory
-<https://github.com/openstack/diskimage-builder/tree/master/elements>`_
+<https://git.openstack.org/cgit/openstack/diskimage-builder/tree/elements>`_
 and documented in the `diskimage-builder elements documentation
 <http://docs.openstack.org/developer/diskimage-builder/elements.html>`_.
 
diff --git a/doc/networking-guide/source/adv_config_qos.rst b/doc/networking-guide/source/adv_config_qos.rst
index 0aaa796008..875c0bd3d4 100644
--- a/doc/networking-guide/source/adv_config_qos.rst
+++ b/doc/networking-guide/source/adv_config_qos.rst
@@ -37,7 +37,7 @@ Supported QoS rule types
 Any plug-in or ml2 mechanism driver can claim support for some QoS rule types
 by providing a plug-in/driver class property called 'supported_qos_rule_types'
 that returns a list of strings that correspond to QoS rule types:
-`<https://github.com/openstack/neutron/blob/master/neutron/services/qos/qos_consts.py>`
+`<https://git.openstack.org/cgit/openstack/neutron/tree/neutron/services/qos/qos_consts.py>`
 
 .. note::
    For the Liberty release only egress bandwidth limit rules are supported.
diff --git a/tools/README-USE-openstack-doc-tools.txt b/tools/README-USE-openstack-doc-tools.txt
index 9af43bb54e..87e4bb9f90 100644
--- a/tools/README-USE-openstack-doc-tools.txt
+++ b/tools/README-USE-openstack-doc-tools.txt
@@ -2,7 +2,7 @@ With the exception of the autogenerate-config-flagmappings and
 www-generator directories, the tools directory has been moved to a
 separate repository openstack-doc-tools:
 
-https://github.com/openstack/openstack-doc-tools
+https://git.openstack.org/cgit/openstack/openstack-doc-tools
 
 Please do not make changes here, commit instead to openstack-doc-tools
 unless you need those for gating jobs.