openstack
/
puppet-tempest
Code Issues Proposed changes

Merge "Add l2gw_switch as parameter for testing purposes"

This commit is contained in:
Jenkins 2017-06-05 14:24:36 +00:00 committed by Gerrit Code Review
parent 23ec01852f 8e90ae5e4a
commit b9f84e4d33
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/init.pp
View File

@ -38,6 +38,8 @@
# Defaults to true
# [*configure_networks*]
# Defaults to true
# [*l2gw_switch*]
# Defaults to undef
# [*public_network_name*]
# Defaults to undef
# [*neutron_api_extensions*]
@ -294,6 +296,7 @@ class tempest(
$resize_available = undef,
$change_password_available = undef,
$use_dynamic_credentials = undef,
$l2gw_switch = undef,
# neutron config
$public_network_id = undef,
# Upstream has a bad default - set it to empty string.
@ -523,6 +526,7 @@ the future release. Please use tempest::package_ensure instead.")
'image-feature-enabled/api_v1': value => $glance_v1;
'image-feature-enabled/api_v2': value => $glance_v2;
'network-feature-enabled/api_extensions': value => $neutron_api_extensions;
'network/l2gw_switch': value => $l2gw_switch;
'network/public_network_id': value => $public_network_id;
'network/public_router_id': value => $public_router_id;
'dashboard/login_url': value => $login_url;

1
spec/classes/tempest_init_spec.rb
View File

@ -236,6 +236,7 @@ describe 'tempest' do
is_expected.to contain_tempest_config('image-feature-enabled/api_v1').with(:value => true)
is_expected.to contain_tempest_config('image-feature-enabled/api_v2').with(:value => true)
is_expected.to contain_tempest_config('network-feature-enabled/api_extensions').with(:value => nil)
is_expected.to contain_tempest_config('network/l2gw_switch').with(:value => nil)
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)