OpenDev Migration Patch

This commit was bulk generated and pushed by the OpenDev sysadmins
as a part of the Git hosting and code review systems migration
detailed in these mailing list posts:

http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003603.html
http://lists.openstack.org/pipermail/openstack-discuss/2019-April/004920.html

Attempts have been made to correct repository namespaces and
hostnames based on simple pattern matching, but it's possible some
were updated incorrectly or missed entirely. Please reach out to us
via the contact information listed at https://opendev.org/ with any
questions you may have.

22 files changed, 102 insertions, 102 deletions

diff --git a/.gitreview b/.gitreview
index 38db9b90..ab3a1c06 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,5 +1,5 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/trove.git
 defaultbranch=stable/queens
diff --git a/.zuul.yaml b/.zuul.yaml
index 1c54d686..d6803fb8 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -61,7 +61,7 @@
     post-run: playbooks/legacy/trove-functional-dsvm-mysql/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/diskimage-builder
       - openstack/python-troveclient
       - openstack/tripleo-image-elements
@@ -75,8 +75,8 @@
     post-run: playbooks/legacy/grenade-dsvm-trove/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-dev/grenade
-      - openstack-infra/devstack-gate
+      - openstack/grenade
+      - openstack/devstack-gate
       - openstack/trove
       - openstack/trove-dashboard
 
@@ -87,7 +87,7 @@
     post-run: playbooks/legacy/trove-scenario-dsvm-cassandra-single/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/diskimage-builder
       - openstack/python-troveclient
       - openstack/tripleo-image-elements
@@ -101,7 +101,7 @@
     post-run: playbooks/legacy/trove-scenario-dsvm-cassandra-multi/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/diskimage-builder
       - openstack/python-troveclient
       - openstack/tripleo-image-elements
@@ -115,7 +115,7 @@
     post-run: playbooks/legacy/trove-scenario-dsvm-couchdb-single/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/diskimage-builder
       - openstack/python-troveclient
       - openstack/tripleo-image-elements
@@ -129,7 +129,7 @@
     post-run: playbooks/legacy/trove-scenario-dsvm-couchbase-single/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/diskimage-builder
       - openstack/python-troveclient
       - openstack/tripleo-image-elements
@@ -143,7 +143,7 @@
     post-run: playbooks/legacy/trove-scenario-dsvm-mariadb-single/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/diskimage-builder
       - openstack/python-troveclient
       - openstack/tripleo-image-elements
@@ -157,7 +157,7 @@
     post-run: playbooks/legacy/trove-scenario-dsvm-mariadb-multi/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/diskimage-builder
       - openstack/python-troveclient
       - openstack/tripleo-image-elements
@@ -171,7 +171,7 @@
     post-run: playbooks/legacy/trove-scenario-dsvm-mongodb-single/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/diskimage-builder
       - openstack/python-troveclient
       - openstack/tripleo-image-elements
@@ -185,7 +185,7 @@
     post-run: playbooks/legacy/trove-scenario-dsvm-mongodb-multi/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/diskimage-builder
       - openstack/python-troveclient
       - openstack/tripleo-image-elements
@@ -199,7 +199,7 @@
     post-run: playbooks/legacy/trove-scenario-dsvm-mysql-single/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/diskimage-builder
       - openstack/python-troveclient
       - openstack/tripleo-image-elements
@@ -213,7 +213,7 @@
     post-run: playbooks/legacy/trove-scenario-dsvm-mysql-multi/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/diskimage-builder
       - openstack/python-troveclient
       - openstack/tripleo-image-elements
@@ -227,7 +227,7 @@
     post-run: playbooks/legacy/trove-scenario-dsvm-percona-multi/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/diskimage-builder
       - openstack/python-troveclient
       - openstack/tripleo-image-elements
@@ -241,7 +241,7 @@
     post-run: playbooks/legacy/trove-scenario-dsvm-percona-single/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/diskimage-builder
       - openstack/python-troveclient
       - openstack/tripleo-image-elements
@@ -255,7 +255,7 @@
     post-run: playbooks/legacy/trove-scenario-dsvm-postgresql-single/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/diskimage-builder
       - openstack/python-troveclient
       - openstack/tripleo-image-elements
@@ -269,7 +269,7 @@
     post-run: playbooks/legacy/trove-scenario-dsvm-postgresql-multi/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/diskimage-builder
       - openstack/python-troveclient
       - openstack/tripleo-image-elements
@@ -283,7 +283,7 @@
     post-run: playbooks/legacy/trove-scenario-dsvm-pxc-single/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/diskimage-builder
       - openstack/python-troveclient
       - openstack/tripleo-image-elements
@@ -297,7 +297,7 @@
     post-run: playbooks/legacy/trove-scenario-dsvm-pxc-multi/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/diskimage-builder
       - openstack/python-troveclient
       - openstack/tripleo-image-elements
@@ -311,7 +311,7 @@
     post-run: playbooks/legacy/trove-scenario-dsvm-redis-single/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/diskimage-builder
       - openstack/python-troveclient
       - openstack/tripleo-image-elements
@@ -325,7 +325,7 @@
     post-run: playbooks/legacy/trove-scenario-dsvm-redis-multi/post.yaml
     timeout: 10800
     required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
       - openstack/diskimage-builder
       - openstack/python-troveclient
       - openstack/tripleo-image-elements
diff --git a/playbooks/legacy/grenade-dsvm-trove/run.yaml b/playbooks/legacy/grenade-dsvm-trove/run.yaml
index 11d7ef83..ea0eea9c 100644
--- a/playbooks/legacy/grenade-dsvm-trove/run.yaml
+++ b/playbooks/legacy/grenade-dsvm-trove/run.yaml
@@ -13,12 +13,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -27,7 +27,7 @@
         cmd: |
           set -e
           set -x
-          export PROJECTS="openstack-dev/grenade $PROJECTS"
+          export PROJECTS="openstack/grenade $PROJECTS"
           export PROJECTS="openstack/trove-dashboard $PROJECTS"
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TEMPEST=1
diff --git a/playbooks/legacy/trove-functional-dsvm-mysql/run.yaml b/playbooks/legacy/trove-functional-dsvm-mysql/run.yaml
index eed59800..ad5e5402 100644
--- a/playbooks/legacy/trove-functional-dsvm-mysql/run.yaml
+++ b/playbooks/legacy/trove-functional-dsvm-mysql/run.yaml
@@ -13,12 +13,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -29,7 +29,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin trove https://git.openstack.org/openstack/trove
+          enable_plugin trove https://opendev.org/openstack/trove
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/trove-scenario-dsvm-cassandra-multi/run.yaml b/playbooks/legacy/trove-scenario-dsvm-cassandra-multi/run.yaml
index 52cacef4..5bf2e01c 100644
--- a/playbooks/legacy/trove-scenario-dsvm-cassandra-multi/run.yaml
+++ b/playbooks/legacy/trove-scenario-dsvm-cassandra-multi/run.yaml
@@ -14,12 +14,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -30,7 +30,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin trove https://git.openstack.org/openstack/trove
+          enable_plugin trove https://opendev.org/openstack/trove
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/trove-scenario-dsvm-cassandra-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-cassandra-single/run.yaml
index 95af0e46..188993cd 100644
--- a/playbooks/legacy/trove-scenario-dsvm-cassandra-single/run.yaml
+++ b/playbooks/legacy/trove-scenario-dsvm-cassandra-single/run.yaml
@@ -14,12 +14,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -30,7 +30,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin trove https://git.openstack.org/openstack/trove
+          enable_plugin trove https://opendev.org/openstack/trove
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/trove-scenario-dsvm-couchbase-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-couchbase-single/run.yaml
index ab2a3f62..744aa926 100644
--- a/playbooks/legacy/trove-scenario-dsvm-couchbase-single/run.yaml
+++ b/playbooks/legacy/trove-scenario-dsvm-couchbase-single/run.yaml
@@ -14,12 +14,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -30,7 +30,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin trove https://git.openstack.org/openstack/trove
+          enable_plugin trove https://opendev.org/openstack/trove
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/trove-scenario-dsvm-couchdb-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-couchdb-single/run.yaml
index 525e7462..ec84d8e9 100644
--- a/playbooks/legacy/trove-scenario-dsvm-couchdb-single/run.yaml
+++ b/playbooks/legacy/trove-scenario-dsvm-couchdb-single/run.yaml
@@ -13,12 +13,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -29,7 +29,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin trove https://git.openstack.org/openstack/trove
+          enable_plugin trove https://opendev.org/openstack/trove
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/trove-scenario-dsvm-mariadb-multi/run.yaml b/playbooks/legacy/trove-scenario-dsvm-mariadb-multi/run.yaml
index 7bfdc7ea..4ef0ce34 100644
--- a/playbooks/legacy/trove-scenario-dsvm-mariadb-multi/run.yaml
+++ b/playbooks/legacy/trove-scenario-dsvm-mariadb-multi/run.yaml
@@ -13,12 +13,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -29,7 +29,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin trove https://git.openstack.org/openstack/trove
+          enable_plugin trove https://opendev.org/openstack/trove
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/trove-scenario-dsvm-mariadb-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-mariadb-single/run.yaml
index 04119c58..92869f45 100644
--- a/playbooks/legacy/trove-scenario-dsvm-mariadb-single/run.yaml
+++ b/playbooks/legacy/trove-scenario-dsvm-mariadb-single/run.yaml
@@ -13,12 +13,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -29,7 +29,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin trove https://git.openstack.org/openstack/trove
+          enable_plugin trove https://opendev.org/openstack/trove
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/trove-scenario-dsvm-mongodb-multi/run.yaml b/playbooks/legacy/trove-scenario-dsvm-mongodb-multi/run.yaml
index 5145f431..0adc9731 100644
--- a/playbooks/legacy/trove-scenario-dsvm-mongodb-multi/run.yaml
+++ b/playbooks/legacy/trove-scenario-dsvm-mongodb-multi/run.yaml
@@ -13,12 +13,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -29,7 +29,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin trove https://git.openstack.org/openstack/trove
+          enable_plugin trove https://opendev.org/openstack/trove
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/trove-scenario-dsvm-mongodb-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-mongodb-single/run.yaml
index 109fefca..5432c0d1 100644
--- a/playbooks/legacy/trove-scenario-dsvm-mongodb-single/run.yaml
+++ b/playbooks/legacy/trove-scenario-dsvm-mongodb-single/run.yaml
@@ -13,12 +13,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -29,7 +29,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin trove https://git.openstack.org/openstack/trove
+          enable_plugin trove https://opendev.org/openstack/trove
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/trove-scenario-dsvm-mysql-multi/run.yaml b/playbooks/legacy/trove-scenario-dsvm-mysql-multi/run.yaml
index f273b17a..dfc88f8f 100644
--- a/playbooks/legacy/trove-scenario-dsvm-mysql-multi/run.yaml
+++ b/playbooks/legacy/trove-scenario-dsvm-mysql-multi/run.yaml
@@ -13,12 +13,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -29,7 +29,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin trove https://git.openstack.org/openstack/trove
+          enable_plugin trove https://opendev.org/openstack/trove
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/trove-scenario-dsvm-mysql-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-mysql-single/run.yaml
index 53438cff..0312ef23 100644
--- a/playbooks/legacy/trove-scenario-dsvm-mysql-single/run.yaml
+++ b/playbooks/legacy/trove-scenario-dsvm-mysql-single/run.yaml
@@ -13,12 +13,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -29,7 +29,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin trove https://git.openstack.org/openstack/trove
+          enable_plugin trove https://opendev.org/openstack/trove
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/trove-scenario-dsvm-percona-multi/run.yaml b/playbooks/legacy/trove-scenario-dsvm-percona-multi/run.yaml
index df1d6807..c7156064 100644
--- a/playbooks/legacy/trove-scenario-dsvm-percona-multi/run.yaml
+++ b/playbooks/legacy/trove-scenario-dsvm-percona-multi/run.yaml
@@ -13,12 +13,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -29,7 +29,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin trove https://git.openstack.org/openstack/trove
+          enable_plugin trove https://opendev.org/openstack/trove
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/trove-scenario-dsvm-percona-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-percona-single/run.yaml
index 81bdeff1..789189ca 100644
--- a/playbooks/legacy/trove-scenario-dsvm-percona-single/run.yaml
+++ b/playbooks/legacy/trove-scenario-dsvm-percona-single/run.yaml
@@ -13,12 +13,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -29,7 +29,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin trove https://git.openstack.org/openstack/trove
+          enable_plugin trove https://opendev.org/openstack/trove
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/trove-scenario-dsvm-postgresql-multi/run.yaml b/playbooks/legacy/trove-scenario-dsvm-postgresql-multi/run.yaml
index 0937f1a7..b5095d7e 100644
--- a/playbooks/legacy/trove-scenario-dsvm-postgresql-multi/run.yaml
+++ b/playbooks/legacy/trove-scenario-dsvm-postgresql-multi/run.yaml
@@ -14,12 +14,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -30,7 +30,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin trove https://git.openstack.org/openstack/trove
+          enable_plugin trove https://opendev.org/openstack/trove
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/trove-scenario-dsvm-postgresql-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-postgresql-single/run.yaml
index fb4d1e25..c017693f 100644
--- a/playbooks/legacy/trove-scenario-dsvm-postgresql-single/run.yaml
+++ b/playbooks/legacy/trove-scenario-dsvm-postgresql-single/run.yaml
@@ -14,12 +14,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -30,7 +30,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin trove https://git.openstack.org/openstack/trove
+          enable_plugin trove https://opendev.org/openstack/trove
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/trove-scenario-dsvm-pxc-multi/run.yaml b/playbooks/legacy/trove-scenario-dsvm-pxc-multi/run.yaml
index 880aaf5e..38bd2a01 100644
--- a/playbooks/legacy/trove-scenario-dsvm-pxc-multi/run.yaml
+++ b/playbooks/legacy/trove-scenario-dsvm-pxc-multi/run.yaml
@@ -13,12 +13,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -29,7 +29,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin trove https://git.openstack.org/openstack/trove
+          enable_plugin trove https://opendev.org/openstack/trove
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/trove-scenario-dsvm-pxc-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-pxc-single/run.yaml
index babf48d3..a9bc25b1 100644
--- a/playbooks/legacy/trove-scenario-dsvm-pxc-single/run.yaml
+++ b/playbooks/legacy/trove-scenario-dsvm-pxc-single/run.yaml
@@ -13,12 +13,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -29,7 +29,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin trove https://git.openstack.org/openstack/trove
+          enable_plugin trove https://opendev.org/openstack/trove
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/trove-scenario-dsvm-redis-multi/run.yaml b/playbooks/legacy/trove-scenario-dsvm-redis-multi/run.yaml
index 6d849d02..ced306fe 100644
--- a/playbooks/legacy/trove-scenario-dsvm-redis-multi/run.yaml
+++ b/playbooks/legacy/trove-scenario-dsvm-redis-multi/run.yaml
@@ -13,12 +13,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -29,7 +29,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin trove https://git.openstack.org/openstack/trove
+          enable_plugin trove https://opendev.org/openstack/trove
 
           EOF
         executable: /bin/bash
diff --git a/playbooks/legacy/trove-scenario-dsvm-redis-single/run.yaml b/playbooks/legacy/trove-scenario-dsvm-redis-single/run.yaml
index 8c228954..3a1744ba 100644
--- a/playbooks/legacy/trove-scenario-dsvm-redis-single/run.yaml
+++ b/playbooks/legacy/trove-scenario-dsvm-redis-single/run.yaml
@@ -13,12 +13,12 @@
           set -x
           cat > clonemap.yaml << EOF
           clonemap:
-            - name: openstack-infra/devstack-gate
+            - name: openstack/devstack-gate
               dest: devstack-gate
           EOF
           /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \
-              https://git.openstack.org \
-              openstack-infra/devstack-gate
+              https://opendev.org \
+              openstack/devstack-gate
         executable: /bin/bash
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'
@@ -29,7 +29,7 @@
           set -x
           cat << 'EOF' >>"/tmp/dg-local.conf"
           [[local|localrc]]
-          enable_plugin trove https://git.openstack.org/openstack/trove
+          enable_plugin trove https://opendev.org/openstack/trove
 
           EOF
         executable: /bin/bash