Add support for [baremetal] enabld_drivers

Change-Id: I96cd5895c7f1de8a7df923999a05f750588595a0
This commit is contained in:
Takashi Kajinami 2024-10-10 15:49:28 +09:00
parent dbc9a01d39
commit cd8e8cee22
3 changed files with 9 additions and 0 deletions

View File

@ -309,6 +309,8 @@
# Defaults to undef # Defaults to undef
# [*baremetal_driver*] # [*baremetal_driver*]
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# [*baremetal_enabled_drivers*]
# Defaults to $facts['os_service_default']
# [*baremetal_enabled_hardware_types*] # [*baremetal_enabled_hardware_types*]
# Defaults to $facts['os_service_default'] # Defaults to $facts['os_service_default']
# [*load_balancer_member_role*] # [*load_balancer_member_role*]
@ -527,6 +529,7 @@ class tempest(
Optional[String[1]] $heat_flavor_name = undef, Optional[String[1]] $heat_flavor_name = undef,
# ironic options # ironic options
$baremetal_driver = $facts['os_service_default'], $baremetal_driver = $facts['os_service_default'],
$baremetal_enabled_drivers = $facts['os_service_default'],
$baremetal_enabled_hardware_types = $facts['os_service_default'], $baremetal_enabled_hardware_types = $facts['os_service_default'],
# octavia options # octavia options
$load_balancer_member_role = $facts['os_service_default'], $load_balancer_member_role = $facts['os_service_default'],
@ -797,6 +800,7 @@ class tempest(
'heat_plugin/minimal_instance_type': value => $flavor_ref; 'heat_plugin/minimal_instance_type': value => $flavor_ref;
# ironic-tempest-plugin # ironic-tempest-plugin
'baremetal/driver': value => $baremetal_driver; 'baremetal/driver': value => $baremetal_driver;
'baremetal/enabled_drivers': value => join(any2array($baremetal_enabled_drivers), ',');
'baremetal/enabled_hardware_types': value => join(any2array($baremetal_enabled_hardware_types), ','); 'baremetal/enabled_hardware_types': value => join(any2array($baremetal_enabled_hardware_types), ',');
# octavia-tempest-plugin # octavia-tempest-plugin
'load_balancer/member_role': value => $load_balancer_member_role; 'load_balancer/member_role': value => $load_balancer_member_role;

View File

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

View File

@ -337,6 +337,7 @@ describe 'tempest' do
is_expected.to contain_tempest_config('heat_plugin/minimal_image_ref').with(:value => nil) is_expected.to contain_tempest_config('heat_plugin/minimal_image_ref').with(:value => nil)
is_expected.to contain_tempest_config('heat_plugin/minimal_instance_type').with(:value => nil) is_expected.to contain_tempest_config('heat_plugin/minimal_instance_type').with(:value => nil)
is_expected.to contain_tempest_config('baremetal/driver').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('baremetal/driver').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('baremetal/enabled_drivers').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_tempest_config('baremetal/enabled_hardware_types').with(:value => '<SERVICE DEFAULT>') is_expected.to contain_tempest_config('baremetal/enabled_hardware_types').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/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/admin_role').with(:value => '<SERVICE DEFAULT>')