From d499a268bd121a87835569df72d6b1224ff9b90d Mon Sep 17 00:00:00 2001
From: Chandan Kumar <chkumar@redhat.com>
Date: Fri, 4 Jan 2019 22:17:34 +0530
Subject: [PATCH] Use tempest_cloud_name for setting cloudname

Currently in tasks/tempest_resources.yml file, we are using
ansible provided openstack cloud modules which needs cloud name
which is harded to default. When os_tempest role is getting used
with different deployment tool, cloud name varies. Adding
tempest_cloud_name var mades it easier to use any cloud name defined
in clouds.yaml file.

Change-Id: I90b93c088f7bc2df0c8f10e6aff58d66c6645290
---
 defaults/main.yml           |  3 +++
 tasks/tempest_resources.yml | 24 ++++++++++++------------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index cf16eb9d..f19e5097 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -271,6 +271,9 @@ tempest_role_project_group: utility_all
 ## Tunable overrides
 tempest_tempest_conf_overrides: {}
 
+## The name of cloud from clouds.yaml
+tempest_cloud_name: "default"
+
 # python-tempestconf variables
 # The tempest_use_tempestconf by default is set to false, set to true if you
 # want to generate the tempest.conf file with this tool, instead of
diff --git a/tasks/tempest_resources.yml b/tasks/tempest_resources.yml
index 6fb9f21d..bad9c033 100644
--- a/tasks/tempest_resources.yml
+++ b/tasks/tempest_resources.yml
@@ -56,7 +56,7 @@
 
     - name: Upload tempest images to glance
       os_image:
-        cloud: default
+        cloud: "{{ tempest_cloud_name }}"
         interface: internal
         validate_certs: "{{ not (keystone_service_internaluri_insecure | bool) }}"
         name: "{{ item.name | default(item.url | basename) }}"
@@ -82,7 +82,7 @@
 
     - name: Add tempest projects
       os_project:
-        cloud: default
+        cloud: "{{ tempest_cloud_name }}"
         state: present
         name: "{{ item }}"
         description: "{{ item }} project"
@@ -97,7 +97,7 @@
 
     - name: Add tempest users
       os_user:
-        cloud: default
+        cloud: "{{ tempest_cloud_name }}"
         state: present
         name: "{{ item.name }}"
         password: "{{ item.password | default(item.name) }}"
@@ -114,7 +114,7 @@
 
     - name: Add tempest roles
       os_keystone_role:
-        cloud: default
+        cloud: "{{ tempest_cloud_name }}"
         interface: internal
         validate_certs: "{{ not (keystone_service_internaluri_insecure | bool) }}"
         name: "{{ item }}"
@@ -126,7 +126,7 @@
 
     - name: Add tempest users to heat_stack_owner role
       os_user_role:
-        cloud: default
+        cloud: "{{ tempest_cloud_name }}"
         state: present
         user: "{{ item.name }}"
         role: "heat_stack_owner"
@@ -147,7 +147,7 @@
 
     - name: Ensure private network exists
       os_network:
-        cloud: default
+        cloud: "{{ tempest_cloud_name }}"
         endpoint_type: internal
         validate_certs: "{{ keystone_service_internaluri_insecure | ternary(false, true) }}"
         name: "{{ tempest_private_net_name }}"
@@ -169,7 +169,7 @@
 
     - name: Ensure public network exists
       os_network:
-        cloud: default
+        cloud: "{{ tempest_cloud_name }}"
         endpoint_type: internal
         validate_certs: "{{ keystone_service_internaluri_insecure | ternary(false, true) }}"
         name: "{{ tempest_public_net_name }}"
@@ -191,7 +191,7 @@
 
     - name: Ensure private subnet exists
       os_subnet:
-        cloud: default
+        cloud: "{{ tempest_cloud_name }}"
         endpoint_type: internal
         validate_certs: "{{ keystone_service_internaluri_insecure | ternary(false, true) }}"
         network_name: "{{ tempest_private_net_name }}"
@@ -207,7 +207,7 @@
 
     - name: Ensure public subnet exists
       os_subnet:
-        cloud: default
+        cloud: "{{ tempest_cloud_name }}"
         endpoint_type: internal
         validate_certs: "{{ keystone_service_internaluri_insecure | ternary(false, true) }}"
         network_name: "{{ tempest_public_net_name }}"
@@ -225,7 +225,7 @@
 
     - name: Create router
       os_router:
-        cloud: default
+        cloud: "{{ tempest_cloud_name }}"
         endpoint_type: internal
         validate_certs: "{{ keystone_service_internaluri_insecure | ternary(false, true) }}"
         name: router
@@ -242,7 +242,7 @@
 
     - name: Create tempest flavors
       os_nova_flavor:
-        cloud: default
+        cloud: "{{ tempest_cloud_name }}"
         endpoint_type: internal
         validate_certs: "{{ keystone_service_internaluri_insecure | ternary(false, true) }}"
         name: "{{ item.name }}"
@@ -260,7 +260,7 @@
 
     - name: Get the admin user project id
       os_project_facts:
-        cloud: default
+        cloud: "{{ tempest_cloud_name }}"
         name: admin
         interface: internal
         validate_certs: "{{ not (keystone_service_internaluri_insecure | bool) }}"