From ef9936232dab7d003e0c196b06ff9f39dc711104 Mon Sep 17 00:00:00 2001
From: "Q.hongtao" <qihongtao@inspur.com>
Date: Wed, 18 Sep 2019 20:19:20 +0800
Subject: [PATCH] Update invalid link

Change-Id: Ia92eff3af741f891f7ebd7cd94ce8953869cc795
---
 doc/source/install/kubernetes-gate.rst        |  4 +--
 ...deploy-tap-as-a-service-neutron-plugin.rst | 18 ++++++------
 .../locale/id/LC_MESSAGES/doc-install.po      | 12 ++++----
 tools/images/openstack/newton/loci.sh         | 28 +++++++++----------
 tools/images/openstack/ocata/loci.sh          | 28 +++++++++----------
 tools/images/openstack/pike/loci.sh           | 28 +++++++++----------
 tools/images/tempest/Dockerfile               | 10 +++----
 7 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/doc/source/install/kubernetes-gate.rst b/doc/source/install/kubernetes-gate.rst
index b122658312..3335a2d61e 100644
--- a/doc/source/install/kubernetes-gate.rst
+++ b/doc/source/install/kubernetes-gate.rst
@@ -55,8 +55,8 @@ should be cloned onto each node in the cluster:
     set -xe
 
     sudo chown -R ubuntu: /opt
-    git clone https://git.openstack.org/openstack/openstack-helm-infra.git /opt/openstack-helm-infra
-    git clone https://git.openstack.org/openstack/openstack-helm.git /opt/openstack-helm
+    git clone https://opendev.org/openstack/openstack-helm-infra.git /opt/openstack-helm-infra
+    git clone https://opendev.org/openstack/openstack-helm.git /opt/openstack-helm
 
 
 Create an inventory file
diff --git a/doc/source/install/plugins/deploy-tap-as-a-service-neutron-plugin.rst b/doc/source/install/plugins/deploy-tap-as-a-service-neutron-plugin.rst
index bd462f395e..ece14abfe3 100644
--- a/doc/source/install/plugins/deploy-tap-as-a-service-neutron-plugin.rst
+++ b/doc/source/install/plugins/deploy-tap-as-a-service-neutron-plugin.rst
@@ -67,13 +67,13 @@ Requirements LOCI image
 
   Add TaaS and TaaS dashboard dependencies in :code:`upper-constraints.txt`
   file in :code:`openstack/requirements` repo, i.e.
-  https://git.openstack.org/openstack/requirements
+  https://opendev.org/openstack/requirements
 
   .. path upper-constraints
   .. code-block:: none
 
-     git+https://git.openstack.org/openstack/tap-as-a-service@master#egg=tap-as-a-service
-     git+https://git.openstack.org/openstack/tap-as-a-service-dashboard@master#egg=tap-as-a-service-dashboard
+     git+https://opendev.org/openstack/tap-as-a-service@master#egg=tap-as-a-service
+     git+https://opendev.org/openstack/tap-as-a-service-dashboard@master#egg=tap-as-a-service-dashboard
 
   .. end
 
@@ -99,7 +99,7 @@ Neutron and Horizon LOCI images
 * Create a patchset for ``openstack/neutron`` repo
 
   Add TaaS dependency in ``requirements.txt`` file in ``openstack/neutron``
-  repo, i.e. https://git.openstack.org/openstack/neutron
+  repo, i.e. https://opendev.org/openstack/neutron
 
   .. path patchset-neutron
   .. code-block:: none
@@ -121,7 +121,7 @@ Neutron and Horizon LOCI images
 * Create a patchset for ``openstack/horizon`` repo
 
   Add TaaS Dashboard dependency in ``requirements.txt`` file in
-  ``openstack/horizon`` repo, i.e. https://git.openstack.org/openstack/horizon
+  ``openstack/horizon`` repo, i.e. https://opendev.org/openstack/horizon
 
   .. path patchset-horizon
   .. code-block:: none
@@ -201,7 +201,7 @@ Neutron and Horizon LOCI images
 
      # Prepare Requirements image
      sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-         https://git.openstack.org/openstack/loci.git \
+         https://opendev.org/openstack/loci.git \
          --network host \
          --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
          --build-arg PROJECT=requirements \
@@ -211,7 +211,7 @@ Neutron and Horizon LOCI images
 
      # Prepare Neutron image
      sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-     https://git.openstack.org/openstack/loci.git \
+     https://opendev.org/openstack/loci.git \
      --build-arg PROJECT=neutron \
      --build-arg PROJECT_REF=${NEUTRON_REF_SPEC} \
      --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
@@ -223,7 +223,7 @@ Neutron and Horizon LOCI images
 
      # Prepare Neutron sriov image
      sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-     https://git.openstack.org/openstack/loci.git \
+     https://opendev.org/openstack/loci.git \
      --build-arg PROJECT=neutron \
      --build-arg PROJECT_REF=${NEUTRON_REF_SPEC} \
      --build-arg FROM=docker.io/ubuntu:18.04 \
@@ -236,7 +236,7 @@ Neutron and Horizon LOCI images
 
      # Prepare Horizon image
      sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-     https://git.openstack.org/openstack/loci.git \
+     https://opendev.org/openstack/loci.git \
      --build-arg PROJECT=horizon \
      --build-arg PROJECT_REF=${HORIZON_REF_SPEC} \
      --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
diff --git a/doc/source/locale/id/LC_MESSAGES/doc-install.po b/doc/source/locale/id/LC_MESSAGES/doc-install.po
index d565961226..9371938c1a 100644
--- a/doc/source/locale/id/LC_MESSAGES/doc-install.po
+++ b/doc/source/locale/id/LC_MESSAGES/doc-install.po
@@ -84,26 +84,26 @@ msgstr "Aktifkan namespace openstack untuk dapat menggunakan Ceph"
 
 msgid ""
 "Add TaaS Dashboard dependency in ``requirements.txt`` file in ``openstack/"
-"horizon`` repo, i.e. https://git.openstack.org/openstack/horizon"
+"horizon`` repo, i.e. https://opendev.org/openstack/horizon"
 msgstr ""
 "Tambahkan dependensi TaaS Dashboard di file ``requirement.txt`` di repo "
-"``openstack/horizon``, misal https://git.openstack.org/openstack/horizon"
+"``openstack/horizon``, misal https://opendev.org/openstack/horizon"
 
 msgid ""
 "Add TaaS and TaaS dashboard dependencies in :code:`upper-constraints.txt` "
-"file in :code:`openstack/requirements` repo, i.e. https://git.openstack.org/"
+"file in :code:`openstack/requirements` repo, i.e. https://opendev.org/"
 "openstack/requirements"
 msgstr ""
 "Tambahkan TaaS dan dependensi dashboard TaaS dalam file :code:`upper-"
 "constraints.txt`  dalam repo :code:`openstack/requirements`, misal  https://"
-"git.openstack.org/openstack/requirements"
+"opendev.org/openstack/requirements"
 
 msgid ""
 "Add TaaS dependency in ``requirements.txt`` file in ``openstack/neutron`` "
-"repo, i.e. https://git.openstack.org/openstack/neutron"
+"repo, i.e. https://opendev.org/openstack/neutron"
 msgstr ""
 "Tambahkan dependensi TaaS dalam file ``requirement.txt`` di repo ``openstack/"
-"neutron``, misal https://git.openstack.org/openstack/neutron"
+"neutron``, misal https://opendev.org/openstack/neutron"
 
 msgid "Add TaaS panel to Horizon Dashboard:"
 msgstr "Tambahkan panel TaaS ke Horizon Dashboard:"
diff --git a/tools/images/openstack/newton/loci.sh b/tools/images/openstack/newton/loci.sh
index 09b76ed2bc..308735dac5 100644
--- a/tools/images/openstack/newton/loci.sh
+++ b/tools/images/openstack/newton/loci.sh
@@ -18,7 +18,7 @@ sudo docker exec docker-in-docker apk update
 sudo docker exec docker-in-docker apk add git
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --network host \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT=requirements \
@@ -27,7 +27,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/requirements:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=keystone \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -38,7 +38,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/keystone:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=heat \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -50,7 +50,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/heat:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=barbican \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -60,7 +60,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/barbican:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=glance \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -71,7 +71,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/glance:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=cinder \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -82,7 +82,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/cinder:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=neutron \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -93,7 +93,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/neutron:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=neutron \
     --build-arg FROM=docker.io/ubuntu:18.04 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -105,7 +105,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/neutron:${IMAGE_TAG}-sriov-1804
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=nova \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -116,7 +116,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/nova:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=horizon \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -127,7 +127,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/horizon:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=senlin \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -138,7 +138,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/senlin:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=congress \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -149,7 +149,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/congress:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=magnum \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -160,7 +160,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/magnum:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=ironic \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
diff --git a/tools/images/openstack/ocata/loci.sh b/tools/images/openstack/ocata/loci.sh
index 863cf38cf2..74a9227fc5 100644
--- a/tools/images/openstack/ocata/loci.sh
+++ b/tools/images/openstack/ocata/loci.sh
@@ -18,7 +18,7 @@ sudo docker exec docker-in-docker apk update
 sudo docker exec docker-in-docker apk add git
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --network host \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT=requirements \
@@ -27,7 +27,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/requirements:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=keystone \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -38,7 +38,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/keystone:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=heat \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -50,7 +50,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/heat:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=barbican \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -61,7 +61,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/barbican:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=glance \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -72,7 +72,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/glance:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=cinder \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -83,7 +83,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/cinder:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=neutron \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -94,7 +94,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/neutron:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=neutron \
     --build-arg FROM=docker.io/ubuntu:18.04 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -106,7 +106,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/neutron:${IMAGE_TAG}-sriov-1804
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=nova \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -117,7 +117,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/nova:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=horizon \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -128,7 +128,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/horizon:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=senlin \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -139,7 +139,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/senlin:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=congress \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -150,7 +150,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/congress:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=magnum \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -161,7 +161,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/magnum:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=ironic \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
diff --git a/tools/images/openstack/pike/loci.sh b/tools/images/openstack/pike/loci.sh
index e1d7385c45..c730243787 100755
--- a/tools/images/openstack/pike/loci.sh
+++ b/tools/images/openstack/pike/loci.sh
@@ -18,7 +18,7 @@ sudo docker exec docker-in-docker apk update
 sudo docker exec docker-in-docker apk add git
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --network host \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT=requirements \
@@ -27,7 +27,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/requirements:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=keystone \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -38,7 +38,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/keystone:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=heat \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -50,7 +50,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/heat:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=barbican \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -61,7 +61,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/barbican:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=glance \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -72,7 +72,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/glance:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=cinder \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -83,7 +83,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/cinder:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=neutron \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -94,7 +94,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/neutron:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=neutron \
     --build-arg FROM=docker.io/ubuntu:18.04 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -106,7 +106,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/neutron:${IMAGE_TAG}-sriov-1804
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=nova \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -117,7 +117,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/nova:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=horizon \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -128,7 +128,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/horizon:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=senlin \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -139,7 +139,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/senlin:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=congress \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -150,7 +150,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/congress:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=magnum \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
@@ -161,7 +161,7 @@ sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
 sudo docker exec docker-in-docker docker push docker.io/openstackhelm/magnum:${IMAGE_TAG}
 
 sudo docker exec docker-in-docker docker build --force-rm --pull --no-cache \
-    https://git.openstack.org/openstack/loci.git \
+    https://opendev.org/openstack/loci.git \
     --build-arg PROJECT=ironic \
     --build-arg FROM=gcr.io/google_containers/ubuntu-slim:0.14 \
     --build-arg PROJECT_REF=${OPENSTACK_VERSION} \
diff --git a/tools/images/tempest/Dockerfile b/tools/images/tempest/Dockerfile
index 2a3e3c8fed..4f99fe1566 100644
--- a/tools/images/tempest/Dockerfile
+++ b/tools/images/tempest/Dockerfile
@@ -10,11 +10,11 @@ RUN set -ex ;\
         build-essential \
         python-pip \
         git ;\
-    git clone https://git.openstack.org/openstack/tempest ;\
-    git clone https://git.openstack.org/openstack/cinder-tempest-plugin ;\
-    git clone https://git.openstack.org/openstack/heat-tempest-plugin ;\
-    git clone https://git.openstack.org/openstack/keystone-tempest-plugin ;\
-    git clone https://git.openstack.org/openstack/neutron-tempest-plugin ;\
+    git clone https://opendev.org/openstack/tempest ;\
+    git clone https://opendev.org/openstack/cinder-tempest-plugin ;\
+    git clone https://opendev.org/openstack/heat-tempest-plugin ;\
+    git clone https://opendev.org/openstack/keystone-tempest-plugin ;\
+    git clone https://opendev.org/openstack/neutron-tempest-plugin ;\
     pip install -U setuptools ;\
     pip install wheel ;\
     pip install -e tempest/ \