diff --git a/manifests/init.pp b/manifests/init.pp index d46b2d4a..4f9aa037 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -84,6 +84,12 @@ # Defaults to undef # [*admin_domain_name*] # Defaults to $::os_service_default +# [*admin_user_domain_name*] +# Defaults to $::os_service_default +# [*admin_project_domain_name*] +# Defaults to $::os_service_default +# [*default_credentials_domain_name*] +# Defaults to $::os_service_default # [*image_ref*] # Defaults to undef # [*image_ref_alt*] @@ -280,6 +286,9 @@ class tempest( $admin_project_name = undef, $admin_role = undef, $admin_domain_name = $::os_service_default, + $admin_user_domain_name = $::os_service_default, + $admin_project_domain_name = $::os_service_default, + $default_credentials_domain_name = $::os_service_default, # roles fo the users created by tempest $tempest_roles = $::os_service_default, # image information @@ -487,6 +496,9 @@ class tempest( tempest_config { 'auth/admin_domain_name': value => $admin_domain_name; + 'auth/admin_project_domain_name': value => $admin_project_domain_name; + 'auth/admin_user_domain_name': value => $admin_user_domain_name; + 'auth/default_credentials_domain_name': value => $default_credentials_domain_name; 'auth/admin_password': value => $admin_password, secret => true; 'auth/admin_project_name': value => $admin_project_name; 'auth/admin_username': value => $admin_username; diff --git a/releasenotes/notes/more-domain-opts-18bc20a84df84324.yaml b/releasenotes/notes/more-domain-opts-18bc20a84df84324.yaml new file mode 100644 index 00000000..05c9a38a --- /dev/null +++ b/releasenotes/notes/more-domain-opts-18bc20a84df84324.yaml @@ -0,0 +1,8 @@ +--- +features: + - | + The following two parameters have been added to the ``tempest`` class. + + - ``admin_project_domain_name`` + - ``admin_user_domain_name`` + - ``default_credentials_domain_name`` diff --git a/spec/classes/tempest_init_spec.rb b/spec/classes/tempest_init_spec.rb index 61c4e1cc..d089418a 100644 --- a/spec/classes/tempest_init_spec.rb +++ b/spec/classes/tempest_init_spec.rb @@ -196,6 +196,9 @@ describe 'tempest' do it 'configure tempest config' do is_expected.to contain_tempest_config('auth/admin_domain_name').with(:value => '') + is_expected.to contain_tempest_config('auth/admin_project_domain_name').with(:value => '') + is_expected.to contain_tempest_config('auth/admin_user_domain_name').with(:value => '') + is_expected.to contain_tempest_config('auth/default_credentials_domain_name').with(:value => '') is_expected.to contain_tempest_config('auth/admin_password').with_secret( true ) is_expected.to contain_tempest_config('auth/admin_project_name').with(:value => nil) is_expected.to contain_tempest_config('auth/admin_username').with(:value => nil)