openstack/puppet-tempest
Code Issues Proposed changes

Merge "Accept array for [network-feature-enabled] api_extensions"

Browse Source
This commit is contained in:
Zuul 2022-06-13 20:48:57 +00:00 committed by Gerrit Code Review
commit 7b20e48cec
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/init.pp
View File

@ -39,7 +39,7 @@
# [*public_network_name*]
# Defaults to undef
# [*neutron_api_extensions*]
# Defaults to undef
# Defaults to $::os_service_default
# [*identity_uri*]
# Defaults to undef
# [*identity_uri_v3*]
@ -270,7 +270,7 @@ class tempest(
#
$configure_networks = true,
$public_network_name = undef,
$neutron_api_extensions = undef,
$neutron_api_extensions = $::os_service_default,
# Horizon dashboard config
$login_url = undef,
@ -537,7 +537,7 @@ class tempest(
'image-feature-enabled/api_v1': value => pick($glance_v1, $::os_service_default);
'image-feature-enabled/api_v2': value => pick($glance_v2, $::os_service_default);
'l2gw/l2gw_switch': value => $l2gw_switch;
'network-feature-enabled/api_extensions': value => $neutron_api_extensions;
'network-feature-enabled/api_extensions': value => join(any2array($neutron_api_extensions), ',');
'network/public_network_id': value => $public_network_id;
'network/public_router_id': value => $public_router_id;
'dashboard/login_url': value => $login_url;

2
spec/classes/tempest_init_spec.rb
View File

@ -237,7 +237,7 @@ describe 'tempest' do
is_expected.to contain_tempest_config('image-feature-enabled/api_v1').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('image-feature-enabled/api_v2').with(:value => '<SERVICE DEFAULT>')
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 => 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('dashboard/login_url').with(:value => nil)