From e5a1eb4c878f5a7762b0be49236ad517a330173e Mon Sep 17 00:00:00 2001
From: Martin Kopec <mkopec@redhat.com>
Date: Mon, 18 Oct 2021 09:14:43 +0000
Subject: [PATCH] Reflect x/ to openinfra/ namespace move

Lately ansible-role-refstack-client got moved from x/ namespace
to openinfra/ [1] one, this commit reflects that change.

[1] https://review.opendev.org/c/openstack/project-config/+/765787

Change-Id: Ifba099ebac6ae4498cc088cb1062dc895e3b443a
---
 .zuul.yaml                              | 14 +++++++-------
 README.md                               |  6 +++---
 playbooks/refstack-client-devstack.yaml |  4 ++--
 tasks/install-refstack-client.yaml      |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 4cb5890..2cd277f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -22,9 +22,9 @@
     parent: devstack
     description: A job for refstack-client on a devstack environment
     required-projects:
-      - osf/refstack-client
-      - x/ansible-role-refstack-client
-      - osf/python-tempestconf
+      - openinfra/refstack-client
+      - openinfra/ansible-role-refstack-client
+      - openinfra/python-tempestconf
       - openstack/devstack
       - openstack/requirements
       # NOTE until refstack-client installs plugins from local source
@@ -42,10 +42,10 @@
       - zuul: openstack/devstack
     vars:
       zuul_copy_output:
-        "{{ zuul.projects['opendev.org/osf/refstack-client'].src_dir }}/etc/accounts.yaml": logs
-        "{{ zuul.projects['opendev.org/osf/refstack-client'].src_dir }}/etc/tempest.conf": logs
-        "{{ zuul.projects['opendev.org/osf/refstack-client'].src_dir }}/.tempest/.stestr/": logs
-        "{{ zuul.projects['opendev.org/osf/refstack-client'].src_dir }}/.tempest/tempest.log": logs
+        "{{ zuul.projects['opendev.org/openinfra/refstack-client'].src_dir }}/etc/accounts.yaml": logs
+        "{{ zuul.projects['opendev.org/openinfra/refstack-client'].src_dir }}/etc/tempest.conf": logs
+        "{{ zuul.projects['opendev.org/openinfra/refstack-client'].src_dir }}/.tempest/.stestr/": logs
+        "{{ zuul.projects['opendev.org/openinfra/refstack-client'].src_dir }}/.tempest/tempest.log": logs
       devstack_plugins:
         heat: https://opendev.org/openstack/heat
         designate: https://opendev.org/openstack/designate
diff --git a/README.md b/README.md
index b470f81..55cd8a8 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # ansible-role-refstack-client
 
 ## About
-It's an ansible playbook for running [refstack-client](https://opendev.org/osf/refstack-client).
+It's an ansible playbook for running [refstack-client](https://opendev.org/openinfra/refstack-client).
 It can be useful in automation where this role can be included in other playbooks.
 The role is importable to [Infrared](https://github.com/redhat-openstack/infrared.git) as an infrared
 plugin, so right after Infrared deploys an environment, this role can be executed to ensure the
@@ -42,7 +42,7 @@ deployment is working by passing refstack tests.
 ## Example
 To run the role from the repository:
 ```
-$ git clone https://opendev.org/x/ansible-role-refstack-client.git
+$ git clone https://opendev.org/openinfra/ansible-role-refstack-client.git
 $ cd ansible-role-refstack-client
 $ mkdir roles && ln -s $(pwd) roles/ansible-role-refstack-client
 ```
@@ -69,7 +69,7 @@ $ ansible-playbook playbook.yaml
 Run the following steps to run the plugin:
 1. Install infrared and add ansible-role-refstack-client plugin by providing the url to this repo:
     ```
-    (infrared)$ ir plugin add https://opendev.org/x/ansible-role-refstack-client.git --src-path infrared_plugin
+    (infrared)$ ir plugin add https://opendev.org/openinfra/ansible-role-refstack-client.git --src-path infrared_plugin
     ```
 2. You can verify that the plugin is imported by:
     ```
diff --git a/playbooks/refstack-client-devstack.yaml b/playbooks/refstack-client-devstack.yaml
index c25ca17..1074fc3 100644
--- a/playbooks/refstack-client-devstack.yaml
+++ b/playbooks/refstack-client-devstack.yaml
@@ -23,8 +23,8 @@
     - name: Run ansible-role-refstack-client
       include_tasks: ../tasks/main.yaml
       vars:
-        refstack_client_source: "/home/zuul/{{ zuul.projects['opendev.org/osf/refstack-client'].src_dir }}"
-        tempestconf_source: "/home/zuul/{{ zuul.projects['opendev.org/osf/python-tempestconf'].src_dir }}"
+        refstack_client_source: "/home/zuul/{{ zuul.projects['opendev.org/openinfra/refstack-client'].src_dir }}"
+        tempestconf_source: "/home/zuul/{{ zuul.projects['opendev.org/openinfra/python-tempestconf'].src_dir }}"
         source_credentials: "{{ devstack_base_dir }}/devstack/openrc demo demo"
         source_admin_credentials: "{{ devstack_base_dir }}/devstack/openrc admin admin"
         # not all backends support shrinking shares, LVM one which is used in
diff --git a/tasks/install-refstack-client.yaml b/tasks/install-refstack-client.yaml
index 13520be..a11d44c 100644
--- a/tasks/install-refstack-client.yaml
+++ b/tasks/install-refstack-client.yaml
@@ -9,7 +9,7 @@
 
 - name: Clone refstack-client
   git:
-    repo: 'https://opendev.org/osf/refstack-client.git'
+    repo: 'https://opendev.org/openinfra/refstack-client.git'
     dest: "{{ refstack_client_source }}"
     version: "{{ refstack_client_version }}"
   when: local_refstack_found.matched == 0
@@ -27,7 +27,7 @@
 
 - name: Clone py2 python-tempestconf
   git:
-    repo: 'https://git.openstack.org/osf/python-tempestconf.git'
+    repo: 'https://git.openstack.org/openinfra/python-tempestconf.git'
     dest: "{{ refstack_client_source }}/.tempestconf_source"
     version: "2.5.0"
   when: