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.
2019-04-19 19:27:43 +00:00 · 2019-04-19 19:27:43 +00:00 · 631da66411
commit 631da66411
parent 705ad2dada
26 changed files with 148 additions and 148 deletions
--- a/.gitreview
+++ b/.gitreview
@ -1,5 +1,5 @@
 [gerrit]
-host=review.openstack.org
+host=review.opendev.org
 port=29418
 project=openstack/manila.git
 defaultbranch=stable/rocky
--- a/.zuul.yaml
+++ b/.zuul.yaml
@ -77,8 +77,8 @@
      - ^tools/.*$
      - ^tox.ini$
    required-projects:
-      - openstack-dev/grenade
-      - openstack-infra/devstack-gate
+      - openstack/grenade
+      - openstack/devstack-gate
      - openstack/manila
      - openstack/python-manilaclient
      - openstack/manila-tempest-plugin
@ -105,7 +105,7 @@
    run: playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml
    post-run: playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/post.yaml
    required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
      - openstack/manila
      - openstack/manila-image-elements
      - openstack/manila-tempest-plugin
@ -118,7 +118,7 @@
    run: playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml
    post-run: playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/post.yaml
    required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
      - openstack/manila
      - openstack/manila-image-elements
      - openstack/manila-tempest-plugin
@ -131,7 +131,7 @@
    run: playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml
    post-run: playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/post.yaml
    required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
      - openstack/manila
      - openstack/manila-image-elements
      - openstack/manila-tempest-plugin
@ -144,8 +144,8 @@
    run: playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml
    post-run: playbooks/legacy/manila-tempest-dsvm-glusterfs-native/post.yaml
    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-glusterfs
+      - openstack/devstack-gate
+      - x/devstack-plugin-glusterfs
      - openstack/manila
      - openstack/manila-tempest-plugin
      - openstack/python-manilaclient
@ -157,8 +157,8 @@
    run: playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml
    post-run: playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/post.yaml
    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-glusterfs
+      - openstack/devstack-gate
+      - x/devstack-plugin-glusterfs
      - openstack/manila
      - openstack/manila-tempest-plugin
      - openstack/python-manilaclient
@ -170,8 +170,8 @@
    run: playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml
    post-run: playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/post.yaml
    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-glusterfs
+      - openstack/devstack-gate
+      - x/devstack-plugin-glusterfs
      - openstack/manila
      - openstack/manila-tempest-plugin
      - openstack/python-manilaclient
@ -183,8 +183,8 @@
    run: playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml
    post-run: playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/post.yaml
    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-glusterfs
+      - openstack/devstack-gate
+      - x/devstack-plugin-glusterfs
      - openstack/manila
      - openstack/manila-tempest-plugin
      - openstack/python-manilaclient
@ -196,8 +196,8 @@
    run: playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml
    post-run: playbooks/legacy/manila-tempest-dsvm-hdfs/post.yaml
    required-projects:
-      - openstack-infra/devstack-gate
-      - openstack/devstack-plugin-hdfs
+      - openstack/devstack-gate
+      - x/devstack-plugin-hdfs
      - openstack/manila
      - openstack/manila-tempest-plugin
      - openstack/python-manilaclient
@ -209,7 +209,7 @@
    run: playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml
    post-run: playbooks/legacy/manila-tempest-dsvm-mysql-generic/post.yaml
    required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
      - openstack/manila
      - openstack/manila-image-elements
      - openstack/manila-tempest-plugin
@ -222,7 +222,7 @@
    run: playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml
    post-run: playbooks/legacy/manila-tempest-dsvm-postgres-container/post.yaml
    required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
      - openstack/manila
      - openstack/manila-image-elements
      - openstack/manila-tempest-plugin
@ -235,7 +235,7 @@
    run: playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml
    post-run: playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/post.yaml
    required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
      - openstack/manila
      - openstack/manila-image-elements
      - openstack/manila-tempest-plugin
@ -248,7 +248,7 @@
    run: playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml
    post-run: playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/post.yaml
    required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
      - openstack/manila
      - openstack/manila-image-elements
      - openstack/manila-tempest-plugin
@ -261,7 +261,7 @@
    run: playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml
    post-run: playbooks/legacy/manila-tempest-dsvm-scenario/post.yaml
    required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
      - openstack/manila
      - openstack/manila-image-elements
      - openstack/manila-tempest-plugin
@ -275,7 +275,7 @@
    post-run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/post.yaml
    nodeset: legacy-centos-7
    required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
      - openstack/devstack-plugin-ceph
      - openstack/manila
      - openstack/manila-tempest-plugin
@ -288,7 +288,7 @@
    run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/run.yaml
    post-run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/post.yaml
    required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
      - openstack/devstack-plugin-ceph
      - openstack/manila
      - openstack/manila-tempest-plugin
@ -302,7 +302,7 @@
    post-run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/post.yaml
    nodeset: legacy-centos-7
    required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
      - openstack/devstack-plugin-ceph
      - openstack/manila
      - openstack/manila-tempest-plugin
@ -315,7 +315,7 @@
    run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml
    post-run: playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/post.yaml
    required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
      - openstack/devstack-plugin-ceph
      - openstack/manila
      - openstack/manila-tempest-plugin
@ -329,7 +329,7 @@
    run: playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml
    post-run: playbooks/legacy/manila-tempest-minimal-dsvm-dummy/post.yaml
    required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
      - openstack/manila
      - openstack/manila-tempest-plugin
      - openstack/python-manilaclient
@ -342,7 +342,7 @@
    post-run: playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/post.yaml
    nodeset: legacy-centos-7
    required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
      - openstack/manila
      - openstack/manila-tempest-plugin
      - openstack/neutron-dynamic-routing
@ -359,7 +359,7 @@
    post-run: playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/post.yaml
    nodeset: legacy-centos-7
    required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
      - openstack/devstack-plugin-ceph
      - openstack/manila
      - openstack/manila-tempest-plugin
@ -373,7 +373,7 @@
    post-run: playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/post.yaml
    nodeset: legacy-centos-7
    required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
      - openstack/devstack-plugin-ceph
      - openstack/manila
      - openstack/manila-tempest-plugin
@ -406,7 +406,7 @@
      - ^tools/.*$
      - ^tox.ini$
    required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
      - openstack/manila
      - openstack/python-manilaclient
      - openstack/rally
@ -428,7 +428,7 @@
      - ^tools/.*$
      - ^tox.ini$
    required-projects:
-      - openstack-infra/devstack-gate
+      - openstack/devstack-gate
      - openstack/manila
      - openstack/python-manilaclient
      - openstack/rally
--- a/playbooks/legacy/grenade-dsvm-manila/run.yaml
+++ b/playbooks/legacy/grenade-dsvm-manila/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/manila-tempest-plugin $PROJECTS"
          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
          export PYTHONUNBUFFERED=true
@ -41,7 +41,7 @@
          # Enable manila grenade plugin. Provided repo should be
          # cloned by zuul before devstack run and below provided
          # link should not be used.
-          export GRENADE_PLUGINRC="enable_grenade_plugin manila https://git.openstack.org/openstack/manila"
+          export GRENADE_PLUGINRC="enable_grenade_plugin manila https://opendev.org/openstack/manila"

          # Keep localrc to be able to set some vars in pre_test_hook
          export KEEP_LOCALRC=1
--- a/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-container-scenario-custom-image/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 manila https://git.openstack.org/openstack/manila
+          enable_plugin manila https://opendev.org/openstack/manila

          EOF
        executable: /bin/bash
--- a/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-generic-no-share-servers/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 manila https://git.openstack.org/openstack/manila
+          enable_plugin manila https://opendev.org/openstack/manila

          EOF
        executable: /bin/bash
--- a/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-generic-scenario-custom-image/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 manila https://git.openstack.org/openstack/manila
+          enable_plugin manila https://opendev.org/openstack/manila

          EOF
        executable: /bin/bash
--- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native-heketi/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,9 +30,9 @@
          set -x
          cat << 'EOF' >>"/tmp/dg-local.conf"
          [[local|localrc]]
-          enable_plugin manila https://git.openstack.org/openstack/manila
+          enable_plugin manila https://opendev.org/openstack/manila
          # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
-          enable_plugin devstack-plugin-glusterfs https://git.openstack.org/openstack/devstack-plugin-glusterfs
+          enable_plugin devstack-plugin-glusterfs https://opendev.org/x/devstack-plugin-glusterfs

          # Configure devstack-plugin-glusterfs to enable GlusterFS as a backend for Manila.
          CONFIGURE_GLUSTERFS_MANILA=True
@ -53,7 +53,7 @@
          export DEVSTACK_GATE_NEUTRON=1
          export ENABLED_SERVICES=tempest
          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-          export PROJECTS="openstack/devstack-plugin-glusterfs $PROJECTS"
+          export PROJECTS="x/devstack-plugin-glusterfs $PROJECTS"

          # Keep localrc to be able to set some vars in pre_test_hook
          export KEEP_LOCALRC=1
--- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-native/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,9 +30,9 @@
          set -x
          cat << 'EOF' >>"/tmp/dg-local.conf"
          [[local|localrc]]
-          enable_plugin manila https://git.openstack.org/openstack/manila
+          enable_plugin manila https://opendev.org/openstack/manila
          # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
-          enable_plugin devstack-plugin-glusterfs https://git.openstack.org/openstack/devstack-plugin-glusterfs
+          enable_plugin devstack-plugin-glusterfs https://opendev.org/x/devstack-plugin-glusterfs

          # Configure devstack-plugin-glusterfs to enable GlusterFS as a backend for Manila.
          CONFIGURE_GLUSTERFS_MANILA=True
@ -53,7 +53,7 @@
          export DEVSTACK_GATE_NEUTRON=1
          export ENABLED_SERVICES=tempest
          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-          export PROJECTS="openstack/devstack-plugin-glusterfs $PROJECTS"
+          export PROJECTS="x/devstack-plugin-glusterfs $PROJECTS"

          # Keep localrc to be able to set some vars in pre_test_hook
          export KEEP_LOCALRC=1
--- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs-heketi/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,9 +30,9 @@
          set -x
          cat << 'EOF' >>"/tmp/dg-local.conf"
          [[local|localrc]]
-          enable_plugin manila https://git.openstack.org/openstack/manila
+          enable_plugin manila https://opendev.org/openstack/manila
          # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
-          enable_plugin devstack-plugin-glusterfs https://git.openstack.org/openstack/devstack-plugin-glusterfs
+          enable_plugin devstack-plugin-glusterfs https://opendev.org/x/devstack-plugin-glusterfs

          # Configure devstack-plugin-glusterfs to enable GlusterFS as a backend for Manila.
          CONFIGURE_GLUSTERFS_MANILA=True
@ -53,7 +53,7 @@
          export DEVSTACK_GATE_NEUTRON=1
          export ENABLED_SERVICES=tempest
          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-          export PROJECTS="openstack/devstack-plugin-glusterfs $PROJECTS"
+          export PROJECTS="x/devstack-plugin-glusterfs $PROJECTS"

          # Keep localrc to be able to set some vars in pre_test_hook
          export KEEP_LOCALRC=1
--- a/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-glusterfs-nfs/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,9 +29,9 @@
          set -x
          cat << 'EOF' >>"/tmp/dg-local.conf"
          [[local|localrc]]
-          enable_plugin manila https://git.openstack.org/openstack/manila
+          enable_plugin manila https://opendev.org/openstack/manila
          # Enable devstack-plugin-glusterfs plugin, to install and configure GlusterFS.
-          enable_plugin devstack-plugin-glusterfs https://git.openstack.org/openstack/devstack-plugin-glusterfs
+          enable_plugin devstack-plugin-glusterfs https://opendev.org/x/devstack-plugin-glusterfs

          # Configure devstack-plugin-glusterfs to enable GlusterFS as a backend for Manila.
          CONFIGURE_GLUSTERFS_MANILA=True
@ -52,7 +52,7 @@
          export DEVSTACK_GATE_NEUTRON=1
          export ENABLED_SERVICES=tempest
          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"
-          export PROJECTS="openstack/devstack-plugin-glusterfs $PROJECTS"
+          export PROJECTS="x/devstack-plugin-glusterfs $PROJECTS"
          export PROJECTS="openstack/manila-tempest-plugin $PROJECTS"

          # Keep localrc to be able to set some vars in pre_test_hook
--- a/playbooks/legacy/manila-tempest-dsvm-hdfs/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-hdfs/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,9 +29,9 @@
          set -x
          cat << 'EOF' >>"/tmp/dg-local.conf"
          [[local|localrc]]
-          enable_plugin manila https://git.openstack.org/openstack/manila
+          enable_plugin manila https://opendev.org/openstack/manila
          # Enable devstack-plugin-hdfs plugin, to install and configure HDFS.
-          enable_plugin devstack-plugin-hdfs https://git.openstack.org/openstack/devstack-plugin-hdfs
+          enable_plugin devstack-plugin-hdfs https://opendev.org/x/devstack-plugin-hdfs

          EOF
        executable: /bin/bash
@ -45,7 +45,7 @@
          export PYTHONUNBUFFERED=true
          export DEVSTACK_GATE_NEUTRON=1
          export ENABLED_SERVICES=tempest
-          export PROJECTS="openstack/devstack-plugin-hdfs $PROJECTS"
+          export PROJECTS="x/devstack-plugin-hdfs $PROJECTS"
          export DEVSTACK_PROJECT_FROM_GIT="python-manilaclient"

          # Keep localrc to be able to set some vars in pre_test_hook
--- a/playbooks/legacy/manila-tempest-dsvm-mysql-generic/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-mysql-generic/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 manila https://git.openstack.org/openstack/manila
+          enable_plugin manila https://opendev.org/openstack/manila

          EOF
        executable: /bin/bash
--- a/playbooks/legacy/manila-tempest-dsvm-postgres-container/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-postgres-container/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 manila https://git.openstack.org/openstack/manila
+          enable_plugin manila https://opendev.org/openstack/manila

          EOF
        executable: /bin/bash
--- a/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-postgres-generic-singlebackend/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 manila https://git.openstack.org/openstack/manila
+          enable_plugin manila https://opendev.org/openstack/manila

          EOF
        executable: /bin/bash
--- a/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-postgres-zfsonlinux/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 manila https://git.openstack.org/openstack/manila
+          enable_plugin manila https://opendev.org/openstack/manila

          EOF
        executable: /bin/bash
--- a/playbooks/legacy/manila-tempest-dsvm-scenario/run.yaml
+++ b/playbooks/legacy/manila-tempest-dsvm-scenario/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 manila https://git.openstack.org/openstack/manila
+          enable_plugin manila https://opendev.org/openstack/manila

          EOF
        executable: /bin/bash
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/run.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native-centos-7/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 }}'
@ -64,9 +64,9 @@
          cat << 'EOF' >>"/tmp/dg-local.conf"
          [[local|localrc]]
          SKIP_EPEL_INSTALL=True
-          enable_plugin manila https://git.openstack.org/openstack/manila
+          enable_plugin manila https://opendev.org/openstack/manila

-          enable_plugin devstack-plugin-ceph https://git.openstack.org/openstack/devstack-plugin-ceph
+          enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph

          # Enable CephFS as the backend for Manila.
          ENABLE_CEPH_MANILA=True
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/run.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-native/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,9 +29,9 @@
          set -x
          cat << 'EOF' >>"/tmp/dg-local.conf"
          [[local|localrc]]
-          enable_plugin manila https://git.openstack.org/openstack/manila
+          enable_plugin manila https://opendev.org/openstack/manila

-          enable_plugin devstack-plugin-ceph https://git.openstack.org/openstack/devstack-plugin-ceph
+          enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph

          # Enable CephFS as the backend for Manila.
          ENABLE_CEPH_MANILA=True
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/run.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs-centos-7/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 }}'
@ -64,9 +64,9 @@
          cat << 'EOF' >>"/tmp/dg-local.conf"
          [[local|localrc]]
          SKIP_EPEL_INSTALL=True
-          enable_plugin manila https://git.openstack.org/openstack/manila
+          enable_plugin manila https://opendev.org/openstack/manila

-          enable_plugin devstack-plugin-ceph https://git.openstack.org/openstack/devstack-plugin-ceph
+          enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph

          # Enable CephFS as the backend for Manila.
          ENABLE_CEPH_MANILA=True
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/run.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-cephfs-nfs/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,9 +29,9 @@
          set -x
          cat << 'EOF' >>"/tmp/dg-local.conf"
          [[local|localrc]]
-          enable_plugin manila https://git.openstack.org/openstack/manila
+          enable_plugin manila https://opendev.org/openstack/manila

-          enable_plugin devstack-plugin-ceph https://git.openstack.org/openstack/devstack-plugin-ceph
+          enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph

          # Enable CephFS as the backend for Manila.
          ENABLE_CEPH_MANILA=True
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/run.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-dummy/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 manila https://git.openstack.org/openstack/manila
+          enable_plugin manila https://opendev.org/openstack/manila

          EOF
        executable: /bin/bash
--- a/playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/run.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-dsvm-lvm-centos-7/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 }}'
@ -38,9 +38,9 @@
          cat << 'EOF' >>"/tmp/dg-local.conf"
          [[local|localrc]]
          SKIP_EPEL_INSTALL=True
-          enable_plugin manila https://git.openstack.org/openstack/manila
-          enable_plugin neutron-dynamic-routing https://git.openstack.org/openstack/neutron-dynamic-routing
-          enable_plugin neutron-tempest-plugin https://git.openstack.org/openstack/neutron-tempest-plugin
+          enable_plugin manila https://opendev.org/openstack/manila
+          enable_plugin neutron-dynamic-routing https://opendev.org/openstack/neutron-dynamic-routing
+          enable_plugin neutron-tempest-plugin https://opendev.org/openstack/neutron-tempest-plugin
          EOF
        executable: /bin/bash
        chdir: '{{ ansible_user_dir }}/workspace'
--- a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/run.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-native-centos-7/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 }}'
@ -45,9 +45,9 @@
          disable_service s-object
          disable_service s-proxy

-          enable_plugin manila https://git.openstack.org/openstack/manila
+          enable_plugin manila https://opendev.org/openstack/manila

-          enable_plugin devstack-plugin-ceph https://git.openstack.org/openstack/devstack-plugin-ceph
+          enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph

          # Enable CephFS as the backend for Manila.
          ENABLE_CEPH_MANILA=True
--- a/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/run.yaml
+++ b/playbooks/legacy/manila-tempest-minimal-py35-dsvm-cephfs-nfs-centos-7/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 }}'
@ -45,9 +45,9 @@
          disable_service s-object
          disable_service s-proxy

-          enable_plugin manila https://git.openstack.org/openstack/manila
+          enable_plugin manila https://opendev.org/openstack/manila

-          enable_plugin devstack-plugin-ceph https://git.openstack.org/openstack/devstack-plugin-ceph
+          enable_plugin devstack-plugin-ceph https://opendev.org/openstack/devstack-plugin-ceph

          # Enable CephFS as the backend for Manila.
          ENABLE_CEPH_MANILA=True
--- a/playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/run.yaml
+++ b/playbooks/legacy/rally-dsvm-manila-multibackend-no-ss/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,8 +30,8 @@
          set -x
          cat << 'EOF' >>"/tmp/dg-local.conf"
          [[local|localrc]]
-          enable_plugin manila https://git.openstack.org/openstack/manila
-          enable_plugin rally https://git.openstack.org/openstack/rally
+          enable_plugin manila https://opendev.org/openstack/manila
+          enable_plugin rally https://opendev.org/openstack/rally

          EOF
        executable: /bin/bash
--- a/playbooks/legacy/rally-dsvm-manila-multibackend/run.yaml
+++ b/playbooks/legacy/rally-dsvm-manila-multibackend/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,8 +29,8 @@
          set -x
          cat << 'EOF' >>"/tmp/dg-local.conf"
          [[local|localrc]]
-          enable_plugin manila https://git.openstack.org/openstack/manila
-          enable_plugin rally https://git.openstack.org/openstack/rally
+          enable_plugin manila https://opendev.org/openstack/manila
+          enable_plugin rally https://opendev.org/openstack/rally

          EOF
        executable: /bin/bash