From 6a7a209c9ba3c8dc688c51672325a5a30ca4e6e8 Mon Sep 17 00:00:00 2001 From: Damian Dabrowski Date: Wed, 6 Apr 2022 15:43:37 +0200 Subject: [PATCH] Improve domain support Allow to set domain for admin authentication and dynamically provisioned accounts. Currently tempest admin user has to reside in the same domain as dynamically provisioned accounts. Change-Id: I1d5aa1f32bae42e2eeeed37588f6ca564563e57a --- defaults/main.yml | 2 +- templates/tempest.conf.j2 | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index f8167eaf..d6563eec 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -286,7 +286,7 @@ tempest_tempest_conf_overrides: {} tempest_cloud_name: "default" ## The name of domain from clouds.yaml -tempest_domain_name: "default" +tempest_domain_name: "Default" ## The name of interface from clouds.yaml tempest_interface_name: "internal" diff --git a/templates/tempest.conf.j2 b/templates/tempest.conf.j2 index c2764896..31b4781c 100644 --- a/templates/tempest.conf.j2 +++ b/templates/tempest.conf.j2 @@ -12,7 +12,8 @@ use_dynamic_credentials = False test_accounts_file = {{ tempest_test_accounts_file_path }} {% else %} use_dynamic_credentials = True -admin_domain_name = Default +default_credentials_domain_name = {{ tempest_domain_name }} +admin_domain_name = {{ tempest_domain_name }} admin_username = {{ keystone_admin_user_name }} admin_project_name = {{ keystone_admin_tenant_name }} admin_password = {{ keystone_auth_admin_password }}