openstack/puppet-tempest
Code Issues Proposed changes

Do not override default of [auth] admin_domain_name

Browse Source 
Currently the [auth] admin_domain_name parmaeter defaults to ''
(an empty value) unless the admin_domain_name parameter is defined.
However tempest defines its own service default(which is 'Default') and
overriding the default in puppet layer adds undesired requirement to
set the parameter.

This change removes that override in puppet-tempest and let users
rely on the service default.

Change-Id: I854b2a532a73ac31bda1f0f195be2c76f88a61f3
This commit is contained in:
Takashi Kajinami
2021-10-20 01:20:47 +09:00
parent d45d5805f6
commit 9a09e7c2c8
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/init.pp
View File

@@ -83,7 +83,7 @@
# [*admin_role*] # [*admin_role*]
# Defaults to undef # Defaults to undef
# [*admin_domain_name*] # [*admin_domain_name*]
# Defaults to undef # Defaults to $::os_service_default
# [*image_ref*] # [*image_ref*]
# Defaults to undef # Defaults to undef
# [*image_ref_alt*] # [*image_ref_alt*]
@@ -279,7 +279,7 @@ class tempest(
$admin_password = undef, $admin_password = undef,
$admin_project_name = undef, $admin_project_name = undef,
$admin_role = undef, $admin_role = undef,
$admin_domain_name = undef, $admin_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

2
spec/classes/tempest_init_spec.rb
View File

@@ -195,7 +195,7 @@ describe 'tempest' do
it { should contain_class('openstacklib::openstackclient') } it { should contain_class('openstacklib::openstackclient') }
it 'configure tempest config' do it 'configure tempest config' do
is_expected.to contain_tempest_config('auth/admin_domain_name').with(:value => nil) is_expected.to contain_tempest_config('auth/admin_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)