diff --git a/manifests/init.pp b/manifests/init.pp index 2f05ae24..063cbd5c 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -64,12 +64,20 @@ # Defaults to undef # [*project_name*] # Defaults to undef +# [*user_domain_name*] +# Defaults to $::os_service_default +# [*project_domain_name*] +# Defaults to $::os_service_default # [*alt_username*] # Defaults to undef # [*alt_password*] # Defaults to undef # [*alt_project_name*] # Defaults to undef +# [*alt_user_domain_name*] +# Defaults to $::os_service_default +# [*alt_project_domain_name*] +# Defaults to $::os_service_default # [*admin_username*] # Defaults to undef # [*admin_password*] @@ -293,10 +301,14 @@ class tempest( $username = undef, $password = undef, $project_name = undef, + $user_domain_name = $::os_service_default, + $project_domain_name = $::os_service_default, # another non-admin user $alt_username = undef, $alt_password = undef, $alt_project_name = undef, + $alt_user_domain_name = $::os_service_default, + $alt_project_domain_name = $::os_service_default, # admin user $admin_username = undef, $admin_password = undef, @@ -528,11 +540,15 @@ class tempest( 'identity/alt_password': value => $alt_password, secret => true; 'identity/alt_project_name': value => $alt_project_name; 'identity/alt_username': value => $alt_username; + 'identity/alt_project_domain_name': value => $project_domain_name; + 'identity/alt_user_domain_name': value => $user_domain_name; 'identity/password': value => $password, secret => true; 'identity/project_name': value => $project_name; + 'identity/username': value => $username; + 'identity/project_domain_name': value => $project_domain_name; + 'identity/user_domain_name': value => $user_domain_name; 'identity/uri': value => $identity_uri; 'identity/uri_v3': value => $identity_uri_v3; - 'identity/username': value => $username; 'identity/auth_version': value => $auth_version; 'identity/ca_certificates_file': value => $ca_certificates_file; 'identity/disable_ssl_certificate_validation': value => $disable_ssl_validation; diff --git a/releasenotes/notes/user-domain-params-0f9093ffaac1ee54.yaml b/releasenotes/notes/user-domain-params-0f9093ffaac1ee54.yaml new file mode 100644 index 00000000..b7e870a4 --- /dev/null +++ b/releasenotes/notes/user-domain-params-0f9093ffaac1ee54.yaml @@ -0,0 +1,10 @@ +--- +features: + - | + The following parameters have been added to the ``tempest`` class to mange + domain name parameters for pre-created credentials. + + - ``user_domain_name`` + - ``project_domain_name`` + - ``alt_user_domain_name`` + - ``alt_project_domain_name`` diff --git a/spec/classes/tempest_init_spec.rb b/spec/classes/tempest_init_spec.rb index 7575d9a5..9ede2225 100644 --- a/spec/classes/tempest_init_spec.rb +++ b/spec/classes/tempest_init_spec.rb @@ -225,12 +225,16 @@ describe 'tempest' do is_expected.to contain_tempest_config('identity/alt_password').with_secret( true ) is_expected.to contain_tempest_config('identity/alt_project_name').with(:value => nil) is_expected.to contain_tempest_config('identity/alt_username').with(:value => nil) + is_expected.to contain_tempest_config('identity/alt_project_domain_name').with(:value => '') + is_expected.to contain_tempest_config('identity/alt_user_domain_name').with(:value => '') is_expected.to contain_tempest_config('identity/password').with(:value => nil) is_expected.to contain_tempest_config('identity/password').with_secret( true ) is_expected.to contain_tempest_config('identity/project_name').with(:value => nil) + is_expected.to contain_tempest_config('identity/username').with(:value => nil) + is_expected.to contain_tempest_config('identity/project_domain_name').with(:value => '') + is_expected.to contain_tempest_config('identity/user_domain_name').with(:value => '') is_expected.to contain_tempest_config('identity/uri').with(:value => nil) is_expected.to contain_tempest_config('identity/uri_v3').with(:value => nil) - is_expected.to contain_tempest_config('identity/username').with(:value => nil) is_expected.to contain_tempest_config('identity/ca_certificates_file').with(:value => nil) is_expected.to contain_tempest_config('identity/disable_ssl_certificate_validation').with(:value => nil) is_expected.to contain_tempest_config('identity-feature-enabled/api_v3').with(:value => true)