openstack/puppet-ironic
Code Issues Proposed changes

Add support for [conductor] soft_power_off_timeout

Browse Source 
Change-Id: Ie4b7cf1ccd072d5a7eba7f6fe0c7ad77b1aa53da
This commit is contained in:
Takashi Kajinami 2021-12-10 11:02:12 +09:00
parent e5679fa003
commit e59a538bda
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/conductor.pp
View File

@ -144,6 +144,11 @@
# sufficient DHCP configuration for port.
# Defaults to $::os_service_default
#
# [*soft_power_off_timeout*]
# (optional) Timeout (in seconds) of soft reboot and soft power off
# operation.
# Defaults to $::os_service_default
#
# [*power_state_change_timeout*]
# (optional) Timeout value to wait for a power operation to complete,
# so that the baremetal node is in the desired new power state.
@ -244,6 +249,7 @@ class ironic::conductor (
$provisioning_network_name = undef,
$rescuing_network_name = undef,
$inspection_network_name = undef,
$soft_power_off_timeout = $::os_service_default,
$power_state_change_timeout = $::os_service_default,
$sync_power_state_interval = $::os_service_default,
$sync_power_state_workers = $::os_service_default,
@ -353,6 +359,7 @@ Use inspect_wait_timeout instead')
'deploy/default_boot_option': value => $default_boot_option;
'deploy/default_boot_mode': value => $default_boot_mode;
'neutron/port_setup_delay': value => $port_setup_delay;
'conductor/soft_power_off_timeout': value => $soft_power_off_timeout;
'conductor/power_state_change_timeout': value => $power_state_change_timeout;
'conductor/sync_power_state_interval': value => $sync_power_state_interval;
'conductor/sync_power_state_workers': value => $sync_power_state_workers;

5
releasenotes/notes/conductor-soft_power_off_timeout-f685c4c104467261.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- |
The ``ironic::conductor`` class now supports customizing
the ``[conductor] soft_power_off_timeout`` parameter.

3
spec/classes/ironic_conductor_spec.rb
View File

@ -77,6 +77,7 @@ describe 'ironic::conductor' do
is_expected.to contain_ironic_config('deploy/default_boot_option').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('deploy/default_boot_mode').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('neutron/port_setup_delay').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('conductor/soft_power_off_timeout').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('conductor/power_state_change_timeout').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('conductor/sync_power_state_interval').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('conductor/sync_power_state_workers').with(:value => '<SERVICE DEFAULT>')
@ -107,6 +108,7 @@ describe 'ironic::conductor' do
:default_boot_option => 'local',
:default_boot_mode => 'uefi',
:port_setup_delay => '15',
:soft_power_off_timeout => 600,
:power_state_change_timeout => '300',
:sync_power_state_interval => 120,
:sync_power_state_workers => 2,
@ -141,6 +143,7 @@ describe 'ironic::conductor' do
is_expected.to contain_ironic_config('deploy/default_boot_option').with_value(p[:default_boot_option])
is_expected.to contain_ironic_config('deploy/default_boot_mode').with_value(p[:default_boot_mode])
is_expected.to contain_ironic_config('neutron/port_setup_delay').with_value(p[:port_setup_delay])
is_expected.to contain_ironic_config('conductor/soft_power_off_timeout').with_value(p[:soft_power_off_timeout])
is_expected.to contain_ironic_config('conductor/power_state_change_timeout').with_value(p[:power_state_change_timeout])
is_expected.to contain_ironic_config('conductor/sync_power_state_interval').with_value(p[:sync_power_state_interval])
is_expected.to contain_ironic_config('conductor/sync_power_state_workers').with_value(p[:sync_power_state_workers])