openstack
/
puppet-tempest
Code Issues Proposed changes

Remove hard-coded default of [network] public_router_id 

The current value (an empty string) matches the default value in
tempest, so don't have to be explicitly set.

Change-Id: I5f62c5fed0504ed37f888fc8c9bd87ed44d92806
This commit is contained in:
Takashi Kajinami 2023-07-31 00:57:42 +09:00
parent 72cdf9223b
commit 0700e5af17
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/init.pp
View File

@ -125,7 +125,7 @@
# [*public_network_id*]
# Defaults to undef
# [*public_router_id*]
# Defaults to ''
# Defaults to undef
# [*sahara_plugins*]
# (optional) List of enabled Sahara plugins
# Defaults to undef
@ -380,8 +380,7 @@ class tempest(
$l2gw_switch = undef,
# neutron config
$public_network_id = undef,
# Upstream has a bad default - set it to empty string.
$public_router_id = '',
$public_router_id = undef,
# Sahara config
$sahara_plugins = undef,
# Trove config

2
spec/classes/tempest_init_spec.rb
View File

@ -244,7 +244,7 @@ describe 'tempest' do
is_expected.to contain_tempest_config('l2gw/l2gw_switch').with(:value => nil)
is_expected.to contain_tempest_config('network-feature-enabled/api_extensions').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('network/public_network_id').with(:value => nil)
is_expected.to contain_tempest_config('network/public_router_id').with(:value => '')
is_expected.to contain_tempest_config('network/public_router_id').with(:value => nil)
is_expected.to contain_tempest_config('dashboard/login_url').with(:value => nil)
is_expected.to contain_tempest_config('dashboard/dashboard_url').with(:value => nil)
is_expected.to contain_tempest_config('database/db_flavor_ref').with(:value => nil)