Merge "Fix inconsistencies in git url"

11 files changed, 16 insertions, 17 deletions

diff --git a/README.rst b/README.rst
index 0720b70b5..bcb1ed3df 100644
--- a/README.rst
+++ b/README.rst
@@ -112,7 +112,7 @@ workflow <http://docs.openstack.org/infra/manual/developers.html>`__.
    `Launchpad <https://launchpad.net/kolla>`__.
 -  Attend weekly
    `meetings <https://wiki.openstack.org/wiki/Meetings/Kolla>`__.
--  Contribute `code <https://github.com/openstack/kolla>`__.
+-  Contribute `code <https://git.openstack.org/openstack/kolla>`__.
 
 Contributors
 ============
diff --git a/ansible/roles/manila/templates/manila-share.conf.j2 b/ansible/roles/manila/templates/manila-share.conf.j2
index 8bc24980b..b604a0de5 100644
--- a/ansible/roles/manila/templates/manila-share.conf.j2
+++ b/ansible/roles/manila/templates/manila-share.conf.j2
@@ -71,7 +71,7 @@ driver_handles_share_servers = False
 # Generic driver is the only driver that uses image from Glance for building
 # service VMs in Nova. And following are data for some specific image.
 # We used one defined in [1]
-# [1] https://github.com/openstack/manila/blob/6785cad9/devstack/plugin.sh#L86
+# [1] https://git.openstack.org/cgit/openstack/manila/tree/devstack/plugin.sh?id=6785cad9#n86
 service_instance_password = {{ manila_service_instance_password }}
 service_instance_user = {{ manila_service_instance_user }}
 service_image_name = manila-service-image
diff --git a/dev/heat/kollanode.yaml b/dev/heat/kollanode.yaml
index 04c958f73..a1fa11a6b 100644
--- a/dev/heat/kollanode.yaml
+++ b/dev/heat/kollanode.yaml
@@ -174,7 +174,7 @@ resources:
 
             # Pull the Kolla repo
             cd /root
-            git clone https://github.com/openstack/kolla.git
+            git clone https://git.openstack.org/openstack/kolla
 
             # Add vxlan kernel module for Neutron
             modprobe vxlan
@@ -196,7 +196,7 @@ resources:
             chkconfig firewalld off
 
             # Install Magnum Client
-            git clone http://github.com/openstack/python-magnumclient
+            git clone https://git.openstack.org/openstack/python-magnumclient
             cd python-magnumclient
             sudo pip install -e .
 
diff --git a/doc/CONTRIBUTING.rst b/doc/CONTRIBUTING.rst
index e6ec7a7fe..1ac424cf0 100644
--- a/doc/CONTRIBUTING.rst
+++ b/doc/CONTRIBUTING.rst
@@ -7,9 +7,8 @@ How To Contribute
 Basics
 ======
 
-#. Our source code is hosted on `OpenStack GitHub`_, but pull requests
-   submitted through GitHub will be ignored. Bugs should be filed on
-   launchpad_, not GitHub.
+#. Our source code is hosted on `OpenStack Kolla Git`_. Bugs should be filed on
+   launchpad_.
 
 #. Please follow OpenStack `Gerrit Workflow`_ to to contribute to Kolla.
 
@@ -24,7 +23,7 @@ Basics
 
 #. TrivialFix tags or bugs are not required for documentation changes.
 
-.. _OpenStack GitHub: https://github.com/openstack/kolla
+.. _OpenStack Kolla Git: https://git.openstack.org/cgit/openstack/kolla/
 .. _Gerrit Workflow: http://docs.openstack.org/infra/manual/developers.html#development-workflow
 .. _launchpad: https://bugs.launchpad.net/kolla
 .. _here: https://wiki.openstack.org/wiki/GitCommitMessages
diff --git a/doc/image-building.rst b/doc/image-building.rst
index 76eb2e765..bbff917d7 100644
--- a/doc/image-building.rst
+++ b/doc/image-building.rst
@@ -112,7 +112,7 @@ the best use of the docker cache.
 
     [keystone]
     type = git
-    location = https://github.com/openstack/keystone
+    location = https://git.openstack.org/openstack/keystone
     reference = stable/mitaka
 
     [heat-base]
@@ -184,7 +184,7 @@ image, the operator would add the following block to
 
     [neutron-server-plugin-networking-cisco]
     type = git
-    location = https://github.com/openstack/networking-cisco
+    location = https://git.openstack.org/openstack/networking-cisco
     reference = master
 
 Known issues
diff --git a/doc/vagrant-dev-env.rst b/doc/vagrant-dev-env.rst
index 807b5d265..529453bcb 100644
--- a/doc/vagrant-dev-env.rst
+++ b/doc/vagrant-dev-env.rst
@@ -83,7 +83,7 @@ correctly. On Fedora 22::
 
 Find a location in the system's home directory and checkout the Kolla repo::
 
-    git clone https://github.com/openstack/kolla.git
+    git clone https://git.openstack.org/openstack/kolla
 
 Developers can now tweak the Vagrantfile or bring up the default **all-in-one**
 CentOS 7-based environment::
diff --git a/docker/heka/plugins/decoders/os_swift_log.lua b/docker/heka/plugins/decoders/os_swift_log.lua
index 0296f6e23..04aa6d20f 100644
--- a/docker/heka/plugins/decoders/os_swift_log.lua
+++ b/docker/heka/plugins/decoders/os_swift_log.lua
@@ -28,7 +28,7 @@ local msg = {
     Fields      = nil
 }
 
--- See https://github.com/openstack/swift/blob/2a8b455/swift/common/utils.py#L1423-L1424
+-- See https://git.openstack.org/cgit/openstack/swift/tree/swift/common/utils.py?id=2a8b455#n1423
 local swift_grammar = syslog.build_rsyslog_grammar('<%PRI%>%programname%: %msg%')
 
 function process_message ()
diff --git a/kolla/common/config.py b/kolla/common/config.py
index b243a953b..71b93b888 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -164,8 +164,8 @@ _BASE_OPTS = [
 SOURCES = {
     'openstack-base': {
         'type': 'url',
-        'location': ('https://github.com/openstack/requirements/tarball/'
-                     'master')},
+        'location': ('http://tarballs.openstack.org/requirements/'
+                     'requirements-master.tar.gz')},
     'aodh-base': {
         'type': 'url',
         'location': ('http://tarballs.openstack.org/aodh/'
diff --git a/kolla/tests/etc/default.conf b/kolla/tests/etc/default.conf
index 844ae20d1..933e1f8c4 100644
--- a/kolla/tests/etc/default.conf
+++ b/kolla/tests/etc/default.conf
@@ -3,7 +3,7 @@ debug=True
 
 [neutron-server-plugin-networking-arista]
 reference = master
-location = https://github.com/openstack/networking-arista
+location = https://git.openstack.org/openstack/networking-arista
 type = git
 
 [profiles]
diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py
index 92962913a..e76925960 100644
--- a/kolla/tests/test_build.py
+++ b/kolla/tests/test_build.py
@@ -178,7 +178,7 @@ class KollaWorkerTest(base.TestCase):
         expected_plugin = {
             'name': 'neutron-server-plugin-networking-arista',
             'reference': 'master',
-            'source': 'https://github.com/openstack/networking-arista',
+            'source': 'https://git.openstack.org/openstack/networking-arista',
             'type': 'git'
         }
         for image in kolla.images:
diff --git a/specs/high-availability.rst b/specs/high-availability.rst
index ac31bb682..afe33d5b0 100644
--- a/specs/high-availability.rst
+++ b/specs/high-availability.rst
@@ -175,7 +175,7 @@ not be reliably deployed in an active/active or active/passive fashion.
 
 In general, the Kolla HA environment looks like:
 
-![Image](https://raw.githubusercontent.com/openstack/kolla/master/specs/ha.svg)
+![Image](https://git.openstack.org/cgit/openstack/kolla/plain/specs/ha.svg)
 
 Security impact
 ---------------