openstack/puppet-tempest
Code Issues Proposed changes

Merge "Accept array value for [dns] nameservers"

Browse Source
This commit is contained in:
Zuul
2022-06-20 19:44:33 +00:00
committed by Gerrit Code Review
parent 6fee1ec5e6 7d69a696c0
commit ecd0befe9a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/init.pp
View File

@@ -208,7 +208,7 @@
# [*disable_ssl_validation*]
# Defaults to undef
# [*designate_nameservers*]
# Defaults to undef
# Defaults to $::os_service_default
# [*manage_tests_packages*]
# Defaults to false
# [*attach_encrypted_volume*]
@@ -379,7 +379,7 @@ class tempest(
$img_file = '/var/lib/tempest/cirros-0.4.0-x86_64-disk.img',
$img_disk_format = $::os_service_default,
# designate options
$designate_nameservers = undef,
$designate_nameservers = $::os_service_default,
# ironic options
$baremetal_driver = 'fake',
$baremetal_enabled_hardware_types = 'ipmi',
@@ -582,7 +582,7 @@ class tempest(
'scenario/img_file': value => $img_file;
'scenario/img_disk_format': value => $img_disk_format;
'service_broker/run_service_broker_tests': value => $run_service_broker_tests;
'dns/nameservers': value => $designate_nameservers;
'dns/nameservers': value => join(any2array($designate_nameservers), ',');
'compute-feature-enabled/attach_encrypted_volume': value => $attach_encrypted_volume;
'compute-feature-enabled/resize': value => $resize_available;
'baremetal/driver': value => $baremetal_driver;

2
spec/classes/tempest_init_spec.rb
View File

@@ -205,7 +205,7 @@ describe 'tempest' do
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/use_dynamic_credentials').with(:value => nil)
is_expected.to contain_tempest_config('dns/nameservers').with(:value => nil)
is_expected.to contain_tempest_config('dns/nameservers').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('compute/flavor_ref').with(:value => nil)
is_expected.to contain_tempest_config('compute/flavor_ref_alt').with(:value => nil)
is_expected.to contain_tempest_config('compute/image_ref').with(:value => nil)