From 4017ebcdca4654d052e9bfe6e55aa07969cb4ade Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Fri, 29 Nov 2019 15:11:41 -0500
Subject: [PATCH] tempest: try to find clouds.yaml in /etc/openstack

If the clouds.yaml can't be found in ~/.config/openstack, it can also be
in /etc/openstack.

This is useful for https://review.opendev.org/#/c/696390/.

Change-Id: Ic7cfdb28647fa5addb3e6561cc5a1701f6848645
---
 playbooks/tempest.yml | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/playbooks/tempest.yml b/playbooks/tempest.yml
index 114112112..533af7bd6 100644
--- a/playbooks/tempest.yml
+++ b/playbooks/tempest.yml
@@ -19,13 +19,23 @@
     mode: 0700
   become: true
 
-- name: Copy clouds.yaml file from user's home to /root directory
-  copy:
-    src: '{{ ansible_user_dir }}/.config/openstack/clouds.yaml'
-    remote_src: true
-    dest: '/root/.config/openstack/clouds.yaml'
-    mode: 0600
-  become: true
+- name: Copy clouds.yaml file to /root directory
+  block:
+    - name: Copy clouds.yaml file from user's home to /root directory
+      copy:
+        src: '{{ ansible_user_dir }}/.config/openstack/clouds.yaml'
+        remote_src: true
+        dest: '/root/.config/openstack/clouds.yaml'
+        mode: 0600
+      become: true
+  rescue:
+    - name: Copy clouds.yaml file /etc/openstack to /root directory
+      copy:
+        src: '/etc/openstack/clouds.yaml'
+        remote_src: true
+        dest: '/root/.config/openstack/clouds.yaml'
+        mode: 0600
+      become: true
 
 - name: Set network vars
   set_fact: