openstack/puppet-tempest
Code Issues Proposed changes

Add support for [network] floating_network_name

Browse Source 
The option is needed to allocate floating ip during tests.

Change-Id: Ie313c188e6a021164b9ff6f6c44290d037bdf053
This commit is contained in:
Takashi Kajinami
2025-04-19 23:19:59 +09:00
parent 9ffa793803
commit 3210a24182
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/init.pp
View File

@@ -124,8 +124,10 @@
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# [*public_network_id*] # [*public_network_id*]
# Defaults to undef # Defaults to undef
# [*floating_network_name*]
# Defaults to $facts['os_service_default']
# [*public_router_id*] # [*public_router_id*]
# Defaults to undef # Defaults to $facts['os_service_default']
# [*cinder_available*] # [*cinder_available*]
# Defaults to true # Defaults to true
# [*cinder_backup_available*] # [*cinder_backup_available*]
@@ -445,7 +447,8 @@ class tempest(
$l2gw_switch = $facts['os_service_default'], $l2gw_switch = $facts['os_service_default'],
# neutron config # neutron config
$public_network_id = undef, $public_network_id = undef,
$public_router_id = undef, $floating_network_name = $facts['os_service_default'],
$public_router_id = $facts['os_service_default'],
# Trove config # Trove config
$db_flavor_ref = undef, $db_flavor_ref = undef,
Optional[String[1]] $db_flavor_name = undef, Optional[String[1]] $db_flavor_name = undef,
@@ -696,6 +699,7 @@ class tempest(
'l2gw/l2gw_switch': value => $l2gw_switch; 'l2gw/l2gw_switch': value => $l2gw_switch;
'network-feature-enabled/api_extensions': value => join(any2array($neutron_api_extensions), ','); 'network-feature-enabled/api_extensions': value => join(any2array($neutron_api_extensions), ',');
'network/public_network_id': value => $public_network_id; 'network/public_network_id': value => $public_network_id;
'network/floating_network_name': value => $floating_network_name;
'network/public_router_id': value => $public_router_id; 'network/public_router_id': value => $public_router_id;
'dashboard/dashboard_url': value => $dashboard_url; 'dashboard/dashboard_url': value => $dashboard_url;
'dashboard/disable_ssl_certificate_validation': value => $disable_dashboard_ssl_validation; 'dashboard/disable_ssl_certificate_validation': value => $disable_dashboard_ssl_validation;

4
releasenotes/notes/floating_network_name-9b008d3e260f9c21.yaml Normal file
View File

@@ -0,0 +1,4 @@
---
features:
- |
The new ``tempest::floating_network_name`` parameter has been added.

3
spec/classes/tempest_init_spec.rb
View File

@@ -244,7 +244,8 @@ describe 'tempest' do
is_expected.to contain_tempest_config('l2gw/l2gw_switch').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('l2gw/l2gw_switch').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('network-feature-enabled/api_extensions').with(:value => '<SERVICE DEFAULT>') 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_network_id').with(:value => nil)
is_expected.to contain_tempest_config('network/public_router_id').with(:value => nil) is_expected.to contain_tempest_config('network/floating_network_name').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('network/public_router_id').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('dashboard/dashboard_url').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('dashboard/dashboard_url').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('dashboard/disable_ssl_certificate_validation').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('dashboard/disable_ssl_certificate_validation').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('database/db_flavor_ref').with(:value => nil) is_expected.to contain_tempest_config('database/db_flavor_ref').with(:value => nil)