Support [load_balancer] *_role parameters

Change-Id: Idad462f8d52cb1f439ea137d4844a4872a20133e
This commit is contained in:
Takashi Kajinami
2022-02-07 08:34:12 +09:00
parent 6fbab839e3
commit e919c537f9
3 changed files with 140 additions and 110 deletions

View File

@@ -217,6 +217,14 @@
# Defaults to 'ipmi'
# [*ec2api_tester_roles*]
# Defaults to 'Member'
# [*load_balancer_member_role*]
# Defaults to $::os_service_default
# [*load_balancer_admin_role*]
# Defaults to $::os_service_default
# [*load_balancer_observer_role*]
# Defaults to $::os_service_default
# [*load_balancer_global_observer_role*]
# Defaults to $::os_service_default
#
# DEPREACTED PARAMETERS
# [*img_dir*]
@@ -369,6 +377,11 @@ class tempest(
$baremetal_enabled_hardware_types = 'ipmi',
# ec2api options
$ec2api_tester_roles = ['Member'],
# octavia options
$load_balancer_member_role = $::os_service_default,
$load_balancer_admin_role = $::os_service_default,
$load_balancer_observer_role = $::os_service_default,
$load_balancer_global_observer_role = $::os_service_default,
# DEPRECATED PARAMETERS
$img_dir = undef,
$panko_available = undef,
@@ -606,6 +619,10 @@ class tempest(
'compute-feature-enabled/resize': value => $resize_available;
'baremetal/driver': value => $baremetal_driver;
'baremetal/enabled_hardware_types': value => $baremetal_enabled_hardware_types;
'load_balancer/member_role': value => $load_balancer_member_role;
'load_balancer/admin_role': value => $load_balancer_admin_role;
'load_balancer/observer_role': value => $load_balancer_observer_role;
'load_balancer/global_observer_role': value => $load_balancer_global_observer_role;
}
oslo::concurrency { 'tempest_config': lock_path => $lock_path }

View File

@@ -0,0 +1,9 @@
---
features:
- |
The following parameters have been added to the ``tempest`` class.
- ``load_balancer_member_role``
- ``load_balancer_admin_role``
- ``load_balancer_observer_role``
- ``load_balancer_global_observer_role``

View File

@@ -275,6 +275,10 @@ describe 'tempest' do
is_expected.to contain_tempest_config('identity-feature-enabled/enforce_scope').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('enforce_scope/neutron').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('enforce_scope/nova').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('load_balancer/member_role').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('load_balancer/admin_role').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('load_balancer/observer_role').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('load_balancer/global_observer_role').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('whitebox/db_uri').with(:value => nil)
is_expected.to contain_tempest_config('cli/cli_dir').with(:value => nil)
is_expected.to contain_oslo__concurrency('tempest_config').with(