Merge "Move to opendev"

10 files changed, 23 insertions, 23 deletions

diff --git a/README.rst b/README.rst
index 994a44a98..2bb935a56 100644
--- a/README.rst
+++ b/README.rst
@@ -48,9 +48,9 @@ project. The three deliverables that make up the Kolla project are:
 ================   =========================================================
 Deliverable        Repository
 ================   =========================================================
-kolla              https://git.openstack.org/cgit/openstack/kolla
-kolla-ansible      https://git.openstack.org/cgit/openstack/kolla-ansible
-kolla-cli          https://git.openstack.org/cgit/openstack/kolla-cli
+kolla              https://opendev.org/openstack/kolla
+kolla-ansible      https://opendev.org/openstack/kolla-ansible
+kolla-cli          https://opendev.org/openstack/kolla-cli
 ================   =========================================================
 
 The `Docker images <https://docs.docker.com/storage/storagedriver/>`__
@@ -199,7 +199,7 @@ workflow <https://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://git.openstack.org/cgit/openstack/kolla>`__.
+-  Contribute `code <https://opendev.org/openstack/kolla>`__.
 
 Contributors
 ============
diff --git a/deliverables.yaml b/deliverables.yaml
index 136d8c4c5..803926170 100644
--- a/deliverables.yaml
+++ b/deliverables.yaml
@@ -5,8 +5,8 @@
 
 ---
 - name: kolla
-  repository: https://git.openstack.org/cgit/openstack/kolla
+  repository: https://opendev.org/openstack/kolla
 - name: kolla-ansible
-  repository: https://git.openstack.org/cgit/openstack/kolla-ansible
+  repository: https://opendev.org/openstack/kolla-ansible
 - name: kolla-cli
-  repository: https://git.openstack.org/cgit/openstack/kolla-cli
+  repository: https://opendev.org/openstack/kolla-cli
diff --git a/doc/source/admin/image-building.rst b/doc/source/admin/image-building.rst
index d1f249ebd..1f099802b 100644
--- a/doc/source/admin/image-building.rst
+++ b/doc/source/admin/image-building.rst
@@ -196,7 +196,7 @@ The ``etc/kolla/kolla-build.conf`` file looks like:
 
    [keystone-base]
    type = git
-   location = https://git.openstack.org/openstack/keystone
+   location = https://opendev.org/openstack/keystone
    reference = stable/mitaka
 
    [heat-base]
@@ -356,7 +356,7 @@ image, one may want to add the following to the ``template-override`` file:
    {% extends parent_template %}
 
    {% block neutron_server_footer %}
-   RUN git clone https://git.openstack.org/openstack/networking-cisco \
+   RUN git clone https://opendev.org/x/networking-cisco \
        && pip --no-cache-dir install networking-cisco
    {% endblock %}
 
@@ -391,7 +391,7 @@ Continuing with the above example, add the following to
 
    [neutron-server-plugin-networking-cisco]
    type = git
-   location = https://git.openstack.org/openstack/networking-cisco
+   location = https://opendev.org/x/networking-cisco
    reference = master
 
 The build will clone the repository, resulting in the following archive
diff --git a/doc/source/contributor/CONTRIBUTING.rst b/doc/source/contributor/CONTRIBUTING.rst
index aae2cabd1..ac0871935 100644
--- a/doc/source/contributor/CONTRIBUTING.rst
+++ b/doc/source/contributor/CONTRIBUTING.rst
@@ -8,7 +8,7 @@ Basics
 ======
 
 #. Our source code is hosted on `OpenStack Kolla Git
-   <https://git.openstack.org/cgit/openstack/kolla/>`_. Bugs should be filed on
+   <https://opendev.org/openstack/kolla/>`_. Bugs should be filed on
    `launchpad <https://bugs.launchpad.net/kolla>`_.
 
 #. Please follow OpenStack `Gerrit Workflow
@@ -28,7 +28,7 @@ Basics
    the commit message footer to indicate to reviewers a bug is not required.
 
 Please use the existing sandbox repository, available at `sandbox
-<https://git.openstack.org/cgit/openstack-dev/sandbox>`_,
+<https://opendev.org/openstack-dev/sandbox>`_,
 for learning, understanding and testing the `Gerrit Workflow
 <https://docs.openstack.org/infra/manual/developers.html#development-workflow>`_.
 
diff --git a/kolla/tests/etc/default.conf b/kolla/tests/etc/default.conf
index 545953e34..011de75f4 100644
--- a/kolla/tests/etc/default.conf
+++ b/kolla/tests/etc/default.conf
@@ -3,12 +3,12 @@ debug=True
 
 [neutron-server-plugin-networking-arista]
 reference = master
-location = https://git.openstack.org/openstack/networking-arista
+location = https://opendev.org/x/networking-arista
 type = git
 
 [neutron-base-plugin-neutron-fwaas]
 reference = master
-location = https://git.openstack.org/openstack/neutron-fwaas
+location = https://opendev.org/openstack/neutron-fwaas
 type = git
 
 [profiles]
diff --git a/kolla/tests/test_build.py b/kolla/tests/test_build.py
index 1fe0f27d3..1a0cef8c3 100644
--- a/kolla/tests/test_build.py
+++ b/kolla/tests/test_build.py
@@ -316,7 +316,7 @@ class KollaWorkerTest(base.TestCase):
         expected_plugin = {
             'name': 'neutron-server-plugin-networking-arista',
             'reference': 'master',
-            'source': 'https://git.openstack.org/openstack/networking-arista',
+            'source': 'https://opendev.org/x/networking-arista',
             'type': 'git'
         }
 
diff --git a/specs/high-availability.rst b/specs/high-availability.rst
index 881a5a8ba..7407aca01 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://git.openstack.org/cgit/openstack/kolla/plain/specs/ha.svg)
+![Image](https://opendev.org/openstack/kolla/raw/branch/master/specs/ha.svg)
 
 Security impact
 ---------------
diff --git a/specs/kubernetes-deployment.rst b/specs/kubernetes-deployment.rst
index d5204f223..f96946e34 100644
--- a/specs/kubernetes-deployment.rst
+++ b/specs/kubernetes-deployment.rst
@@ -347,6 +347,6 @@ References
 - [15] http://kubernetes.io/docs/user-guide/node-selection/
 - [16] https://github.com/kubernetes/kubernetes/blob/master/docs/proposals/pod-security-context.md
 - [17] http://blog.kubernetes.io/2015/06/the-distributed-system-toolkit-patterns.html
-- [18] https://review.openstack.org/#/admin/groups/460,members
+- [18] https://review.opendev.org/#/admin/groups/460,members
 - [19] https://etherpad.openstack.org/p/kolla-newton-summit-kolla-gate-walkthru
 - https://github.com/kubernetes/kubernetes
diff --git a/specs/logging-with-heka.rst b/specs/logging-with-heka.rst
index 7cd7770b3..8087a6a41 100644
--- a/specs/logging-with-heka.rst
+++ b/specs/logging-with-heka.rst
@@ -304,10 +304,10 @@ The location of log files on the host will be mentioned in the documentation.
 References
 ==========
 
-[1] <https://review.openstack.org/#/c/252968/>
+[1] <https://review.opendev.org/#/c/252968/>
 [2] <http://hekad.readthedocs.org>
 [3] <http://blog.sematext.com/2015/09/28/recipe-rsyslog-redis-logstash/>
-[4] <https://review.openstack.org/#/c/269745/>
+[4] <https://review.opendev.org/#/c/269745/>
 [5] <http://hekad.readthedocs.org/en/latest/config/inputs/docker_log.html>
 [6] <http://hekad.readthedocs.org/en/latest/config/inputs/logstreamer.html>
-[7] <https://review.openstack.org/#/c/269952/>
+[7] <https://review.opendev.org/#/c/269952/>
diff --git a/tox.ini b/tox.ini
index 9a4e15cc6..883542849 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,7 +8,7 @@ usedevelop=True
 whitelist_externals = find
                       rm
 install_command = pip install {opts} {packages}
-deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY
@@ -58,7 +58,7 @@ commands = bandit --skip B303 -r docker kolla tests tools
 [testenv:venv]
 basepython = python3
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
     -r{toxinidir}/test-requirements.txt
     -r{toxinidir}/doc/requirements.txt
 commands = {posargs}
@@ -66,7 +66,7 @@ commands = {posargs}
 [testenv:docs]
 basepython = python3
 deps =
-    -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+    -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/doc/requirements.txt