openstack
/
puppet-ironic
Code Issues Proposed changes

Add deploy_callback_timeout parameter 

Change-Id: I30fef88b425c2729acf860d489e9fb6a493c5a4e
This commit is contained in:
Maryna Savchenko 2022-07-26 17:04:06 +02:00 committed by Takashi Kajinami
parent e8d678c465
commit 36a824202e
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/conductor.pp
View File

@ -193,6 +193,11 @@
# parallel.
# Defaults to $::os_service_default
#
# [*deploy_callback_timeout*]
# (optional) Timeout (seconds) to wait for a callback from a deploy
# ramdisk. Set to 0 to disable timeout. (integer value)
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*cleaning_network_name*]
@ -254,6 +259,7 @@ class ironic::conductor (
$bootloader = $::os_service_default,
$allow_provisioning_in_maintenance = $::os_service_default,
$image_download_concurrency = $::os_service_default,
$deploy_callback_timeout = $::os_service_default,
# DEPRECATED PARAMETERS
$cleaning_network_name = undef,
$provisioning_network_name = undef,
@ -342,6 +348,7 @@ class ironic::conductor (
'conductor/bootloader': value => $bootloader;
'conductor/allow_provisioning_in_maintenance': value => $allow_provisioning_in_maintenance;
'DEFAULT/image_download_concurrency': value => $image_download_concurrency;
'conductor/deploy_callback_timeout': value => $deploy_callback_timeout;
}
if $cleaning_network_name {

4
releasenotes/notes/conductor-deploy_callback_timeout-0f415dee2dd2c181.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- |
The new ``ironic::conductor::deploy_callback_timeout`` parameter has been added.

3
spec/classes/ironic_conductor_spec.rb
View File

@ -90,6 +90,7 @@ describe 'ironic::conductor' do
is_expected.to contain_ironic_config('conductor/rescue_ramdisk').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('conductor/bootloader').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('DEFAULT/image_download_concurrency').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('conductor/deploy_callback_timeout').with(:value => '<SERVICE DEFAULT>')
end
context 'when overriding parameters' do
@ -126,6 +127,7 @@ describe 'ironic::conductor' do
:bootloader => 'http://host/bootloader',
:allow_provisioning_in_maintenance => false,
:image_download_concurrency => 20,
:deploy_callback_timeout => 1800,
)
end
it 'should replace default parameter with new value' do
@ -161,6 +163,7 @@ describe 'ironic::conductor' do
is_expected.to contain_ironic_config('conductor/bootloader').with_value(p[:bootloader])
is_expected.to contain_ironic_config('conductor/allow_provisioning_in_maintenance').with_value(p[:allow_provisioning_in_maintenance])
is_expected.to contain_ironic_config('DEFAULT/image_download_concurrency').with_value(p[:image_download_concurrency])
is_expected.to contain_ironic_config('conductor/deploy_callback_timeout').with_value(p[:deploy_callback_timeout])
end
end