openstack/puppet-tempest
Code Issues Proposed changes

Support more *_domain_name options

Browse Source 
Change-Id: I9824290beaa4bd88d1a78e72e26ea66c25db4693
This commit is contained in:
Takashi Kajinami 2021-10-20 01:27:12 +09:00
parent 9a09e7c2c8
commit c18ef504ce
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/init.pp
View File

@ -84,6 +84,12 @@
# Defaults to undef # Defaults to undef
# [*admin_domain_name*] # [*admin_domain_name*]
# Defaults to $::os_service_default # 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*] # [*image_ref*]
# Defaults to undef # Defaults to undef
# [*image_ref_alt*] # [*image_ref_alt*]
@ -280,6 +286,9 @@ class tempest(
$admin_project_name = undef, $admin_project_name = undef,
$admin_role = undef, $admin_role = undef,
$admin_domain_name = $::os_service_default, $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 # roles fo the users created by tempest
$tempest_roles = $::os_service_default, $tempest_roles = $::os_service_default,
# image information # image information
@ -487,6 +496,9 @@ class tempest(
tempest_config { tempest_config {
'auth/admin_domain_name': value => $admin_domain_name; '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_password': value => $admin_password, secret => true;
'auth/admin_project_name': value => $admin_project_name; 'auth/admin_project_name': value => $admin_project_name;
'auth/admin_username': value => $admin_username; 'auth/admin_username': value => $admin_username;

8
releasenotes/notes/more-domain-opts-18bc20a84df84324.yaml Normal file
View File

@ -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``

3
spec/classes/tempest_init_spec.rb
View File

@ -196,6 +196,9 @@ describe 'tempest' do
it 'configure tempest config' do it 'configure tempest config' do
is_expected.to contain_tempest_config('auth/admin_domain_name').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('auth/admin_domain_name').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('auth/admin_project_domain_name').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('auth/admin_user_domain_name').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('auth/default_credentials_domain_name').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('auth/admin_password').with_secret( true ) 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_project_name').with(:value => nil)
is_expected.to contain_tempest_config('auth/admin_username').with(:value => nil) is_expected.to contain_tempest_config('auth/admin_username').with(:value => nil)