openstack/puppet-tempest
Code Issues Proposed changes

Make sure credential options are cleared by default

Browse Source 
Change-Id: I432035bf745990f42374fa7e9881ac8ec3291192
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-13 01:33:54 +09:00
parent 7f671c18c5
commit 7a50727f07
2 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
manifests/init.pp
View File

@@ -53,31 +53,31 @@
# [*http_timeout*] # [*http_timeout*]
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# [*username*] # [*username*]
# Defaults to undef # Defaults to $facts['os_service_default']
# [*password*] # [*password*]
# Defaults to undef # Defaults to $facts['os_service_default']
# [*project_name*] # [*project_name*]
# Defaults to undef # Defaults to $facts['os_service_default']
# [*user_domain_name*] # [*user_domain_name*]
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# [*project_domain_name*] # [*project_domain_name*]
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# [*alt_username*] # [*alt_username*]
# Defaults to undef # Defaults to $facts['os_service_default']
# [*alt_password*] # [*alt_password*]
# Defaults to undef # Defaults to $facts['os_service_default']
# [*alt_project_name*] # [*alt_project_name*]
# Defaults to undef # Defaults to $facts['os_service_default']
# [*alt_user_domain_name*] # [*alt_user_domain_name*]
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# [*alt_project_domain_name*] # [*alt_project_domain_name*]
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# [*admin_username*] # [*admin_username*]
# Defaults to undef # Defaults to $facts['os_service_default']
# [*admin_password*] # [*admin_password*]
# Defaults to undef # Defaults to $facts['os_service_default']
# [*admin_project_name*] # [*admin_project_name*]
# Defaults to undef # Defaults to $facts['os_service_default']
# [*admin_role*] # [*admin_role*]
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# [*admin_domain_name*] # [*admin_domain_name*]
@@ -394,21 +394,21 @@ class tempest(
$logging_context_format_string = $facts['os_service_default'], $logging_context_format_string = $facts['os_service_default'],
$http_timeout = $facts['os_service_default'], $http_timeout = $facts['os_service_default'],
# non admin user # non admin user
$username = undef, $username = $facts['os_service_default'],
$password = undef, $password = $facts['os_service_default'],
$project_name = undef, $project_name = $facts['os_service_default'],
$user_domain_name = $facts['os_service_default'], $user_domain_name = $facts['os_service_default'],
$project_domain_name = $facts['os_service_default'], $project_domain_name = $facts['os_service_default'],
# another non-admin user # another non-admin user
$alt_username = undef, $alt_username = $facts['os_service_default'],
$alt_password = undef, $alt_password = $facts['os_service_default'],
$alt_project_name = undef, $alt_project_name = $facts['os_service_default'],
$alt_user_domain_name = $facts['os_service_default'], $alt_user_domain_name = $facts['os_service_default'],
$alt_project_domain_name = $facts['os_service_default'], $alt_project_domain_name = $facts['os_service_default'],
# admin user # admin user
$admin_username = undef, $admin_username = $facts['os_service_default'],
$admin_password = undef, $admin_password = $facts['os_service_default'],
$admin_project_name = undef, $admin_project_name = $facts['os_service_default'],
$admin_role = $facts['os_service_default'], $admin_role = $facts['os_service_default'],
$admin_domain_name = $facts['os_service_default'], $admin_domain_name = $facts['os_service_default'],
$admin_user_domain_name = $facts['os_service_default'], $admin_user_domain_name = $facts['os_service_default'],

32
spec/classes/tempest_init_spec.rb
View File

@@ -195,8 +195,8 @@ describe 'tempest' do
is_expected.to contain_tempest_config('auth/admin_user_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/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 => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('auth/admin_username').with(:value => nil) is_expected.to contain_tempest_config('auth/admin_username').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('auth/admin_system').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('auth/admin_system').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('auth/tempest_roles').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('auth/tempest_roles').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('auth/use_dynamic_credentials').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('auth/use_dynamic_credentials').with(:value => '<SERVICE DEFAULT>')
@@ -223,16 +223,15 @@ describe 'tempest' do
is_expected.to contain_tempest_config('validation/ssh_key_type').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('validation/ssh_key_type').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('identity/admin_role').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('identity/admin_role').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('identity/auth_version').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('identity/auth_version').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('identity/alt_password').with(:value => nil) is_expected.to contain_tempest_config('identity/alt_password').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('identity/alt_password').with_secret( true ) is_expected.to contain_tempest_config('identity/alt_password').with(:value => '<SERVICE DEFAULT>').with_secret( true )
is_expected.to contain_tempest_config('identity/alt_project_name').with(:value => nil) is_expected.to contain_tempest_config('identity/alt_project_name').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('identity/alt_username').with(:value => nil) is_expected.to contain_tempest_config('identity/alt_username').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('identity/alt_project_domain_name').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('identity/alt_project_domain_name').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('identity/alt_user_domain_name').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('identity/alt_user_domain_name').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('identity/password').with(:value => nil) is_expected.to contain_tempest_config('identity/password').with(:value => '<SERVICE DEFAULT>').with_secret(true)
is_expected.to contain_tempest_config('identity/password').with_secret( true ) is_expected.to contain_tempest_config('identity/project_name').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('identity/project_name').with(:value => nil) is_expected.to contain_tempest_config('identity/username').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('identity/username').with(:value => nil)
is_expected.to contain_tempest_config('identity/project_domain_name').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('identity/project_domain_name').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('identity/user_domain_name').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('identity/user_domain_name').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('identity/uri').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('identity/uri').with(:value => '<SERVICE DEFAULT>')
@@ -314,15 +313,14 @@ describe 'tempest' do
is_expected.to contain_tempest_config('dns/nameservers').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('dns/nameservers').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('heat_plugin/auth_url').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('heat_plugin/auth_url').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('heat_plugin/auth_version').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('heat_plugin/auth_version').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('heat_plugin/admin_password').with_secret( true ) is_expected.to contain_tempest_config('heat_plugin/admin_password').with(:value => '<SERVICE DEFAULT>').with_secret( true )
is_expected.to contain_tempest_config('heat_plugin/admin_project_name').with(:value => nil) is_expected.to contain_tempest_config('heat_plugin/admin_project_name').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('heat_plugin/admin_username').with(:value => nil) is_expected.to contain_tempest_config('heat_plugin/admin_username').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('heat_plugin/admin_project_domain_name').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('heat_plugin/admin_project_domain_name').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('heat_plugin/admin_user_domain_name').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('heat_plugin/admin_user_domain_name').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('heat_plugin/password').with(:value => nil) is_expected.to contain_tempest_config('heat_plugin/password').with(:value => '<SERVICE DEFAULT>').with_secret(true)
is_expected.to contain_tempest_config('heat_plugin/password').with_secret( true ) is_expected.to contain_tempest_config('heat_plugin/project_name').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('heat_plugin/project_name').with(:value => nil) is_expected.to contain_tempest_config('heat_plugin/username').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('heat_plugin/username').with(:value => nil)
is_expected.to contain_tempest_config('heat_plugin/image_ref').with(:value => nil) is_expected.to contain_tempest_config('heat_plugin/image_ref').with(:value => nil)
is_expected.to contain_tempest_config('heat_plugin/instance_type').with(:value => nil) is_expected.to contain_tempest_config('heat_plugin/instance_type').with(:value => nil)
is_expected.to contain_tempest_config('heat_plugin/minimal_image_ref').with(:value => nil) is_expected.to contain_tempest_config('heat_plugin/minimal_image_ref').with(:value => nil)