openstack
/
puppet-tempest
Code Issues Proposed changes

Merge "magnum: Use service default if possible"

This commit is contained in:
Zuul 2024-04-25 17:08:39 +00:00 committed by Gerrit Code Review
parent c4ffc0f8dc cc803f5b9c
commit 9d13ea8e65
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
manifests/magnum.pp
View File

@ -47,19 +47,19 @@
#
# [*nic_id*]
# (Optional) The nic_id parameter used in Magnum tempest configuration
# Defaults to 'public'
# Defaults to $facts['os_service_default']
#
# [*magnum_url*]
# (Optional) Bypass URL for Magnum to skip service catalog lookup
# Defaults to undef
# Defaults to $facts['os_service_default']
#
# [*copy_logs*]
# (Optional) Whether to copy nova server logs on failure
# Defaults to true
# Defaults to $facts['os_service_default']
#
# [*dns_nameserver*]
# (Optional) DNS nameserver to use for ClusterTemplate
# Defaults to '8.8.8.8'
# Defaults to $facts['os_service_default']
#
# [*manage_tests_packages*]
# (Optional) Manage the plugin package
@ -82,10 +82,10 @@ class tempest::magnum (
String[1] $master_flavor_id = 'm1.magnum',
Boolean $provision_keypair = false,
$keypair_name = $facts['os_service_default'],
$nic_id = 'public',
$magnum_url = undef,
$copy_logs = true,
$dns_nameserver = '8.8.8.8',
$nic_id = $facts['os_service_default'],
$magnum_url = $facts['os_service_default'],
$copy_logs = $facts['os_service_default'],
$dns_nameserver = $facts['os_service_default'],
Boolean $manage_tests_packages = true,
# DEPRECATED PARAMETERS
$keypair_id = undef,

5
spec/classes/tempest_magnum_spec.rb
View File

@ -21,8 +21,9 @@ describe 'tempest::magnum' do
is_expected.to contain_tempest_config('magnum/keypair_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('magnum/flavor_id').with_value('s1.magnum')
is_expected.to contain_tempest_config('magnum/master_flavor_id').with_value('m1.magnum')
is_expected.to contain_tempest_config('magnum/copy_logs').with_value('true')
is_expected.to contain_tempest_config('magnum/dns_nameserver').with_value('8.8.8.8')
is_expected.to contain_tempest_config('magnum/magnum_url').with_value('<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('magnum/copy_logs').with_value('<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('magnum/dns_nameserver').with_value('<SERVICE DEFAULT>')
end
end