From 6bfad39ec7ae018df68c970873a7f38f0e262a26 Mon Sep 17 00:00:00 2001 From: Chandan Kumar Date: Tue, 15 Jan 2019 17:55:50 +0530 Subject: [PATCH] Use tempest_domain_name var for setting domain Currently in tasks/tempest_resources.yml file, we are using ansible provided openstack cloud modules which needs domain name which is harded to default. When os_tempest role is getting used with different deployment tool, interface varies. Adding tempest_domain_name var mades it easier to use any domain name in clouds.yaml file. It replaces legacy domain-id with domain. Change-Id: I157ac565ac93fcdd4c232beacbb4e33e42b55145 --- defaults/main.yml | 3 +++ tasks/tempest_resources.yml | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 86202979..f5330e57 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -288,6 +288,9 @@ tempest_tempest_conf_overrides: {} ## The name of cloud from clouds.yaml tempest_cloud_name: "default" +## The name of domain from clouds.yaml +tempest_domain_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 f05dcf8d..a2dbdcb5 100644 --- a/tasks/tempest_resources.yml +++ b/tasks/tempest_resources.yml @@ -82,7 +82,7 @@ state: present name: "{{ item }}" description: "{{ item }} project" - domain_id: "default" + domain: "{{ tempest_domain_name }}" interface: internal verify: "{{ not (keystone_service_internaluri_insecure | bool) }}" register: add_project @@ -97,7 +97,7 @@ state: present name: "{{ item.name }}" password: "{{ item.password | default(item.name) }}" - domain: default + domain: "{{ tempest_domain_name }}" default_project: "{{ item.project | default(item.name) }}" interface: internal verify: "{{ not (keystone_service_internaluri_insecure | bool) }}"