openstack/puppet-ironic
Code Issues Proposed changes

Allow setting inspector timeout value

Browse Source 
Allow overriding default timeout value after which introspection
of the node fails.

Change-Id: I74adb998a41ebf8c7ede72a547bbab9173834236
Closes-bug: #1733417
This commit is contained in:
Mateusz Kowalski 2017-11-20 21:55:48 +01:00
parent 179690bb93
commit b6ecd21a67
5 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/conductor.pp
View File

@ -97,6 +97,11 @@
# configdrive_use_swift is true.
# Defaults to $::os_service_default
#
# [*inspect_timeout*]
# (optional) Timeout (seconds) for waiting for node inspection.
# 0 for unlimited.
# Defaults to $::os_service_default
#
# [*default_boot_option*]
# (optional) Default boot option to use when no boot option is explicitly
# requested. One of "netboot" or "local".
@ -161,6 +166,7 @@ class ironic::conductor (
$provisioning_network = $::os_service_default,
$configdrive_use_swift = $::os_service_default,
$configdrive_swift_container = $::os_service_default,
$inspect_timeout = $::os_service_default,
$default_boot_option = $::os_service_default,
$port_setup_delay = $::os_service_default,
$cleaning_network_name = undef,
@ -260,6 +266,7 @@ moved to ironic::glance manifest")
'deploy/continue_if_disk_secure_erase_fails': value => $continue_if_disk_secure_erase_fails;
'conductor/configdrive_use_swift': value => $configdrive_use_swift;
'conductor/configdrive_swift_container': value => $configdrive_swift_container;
'conductor/inspect_timeout': value => $inspect_timeout;
'deploy/default_boot_option': value => $default_boot_option;
'neutron/port_setup_delay': value => $port_setup_delay;
}

7
manifests/inspector.pp
View File

@ -42,6 +42,11 @@
# (optional) API authentication strategy: keystone or noauth
# Defaults to 'keystone'
#
# [*timeout*]
# (optional) Timeout after which introspection is considered failed,
# set to 0 to disable.
# Defaults to $::os_service_default
#
# [*dnsmasq_interface*]
# (optional) The interface for the ironic-inspector dnsmasq process
# to listen on
@ -220,6 +225,7 @@ class ironic::inspector (
$pxe_transfer_protocol = 'tftp',
$debug = undef,
$auth_strategy = 'keystone',
$timeout = $::os_service_default,
$dnsmasq_interface = 'br-ctlplane',
$db_connection = undef,
$ramdisk_logs_dir = '/var/log/ironic-inspector/ramdisk/',
@ -337,6 +343,7 @@ class ironic::inspector (
ironic_inspector_config {
'DEFAULT/listen_address': value => $listen_address;
'DEFAULT/auth_strategy': value => $auth_strategy;
'DEFAULT/timeout': value => $timeout;
'capabilities/boot_mode': value => $detect_boot_mode;
'firewall/dnsmasq_interface': value => $dnsmasq_interface;
'processing/ramdisk_logs_dir': value => $ramdisk_logs_dir;

3
releasenotes/notes/inspector-timeout-value-8fd160aecb0693fc.yaml Normal file
View File

@ -0,0 +1,3 @@
---
features:
- Allow setting value for the inspector timeout

1
spec/classes/ironic_conductor_spec.rb
View File

@ -76,6 +76,7 @@ describe 'ironic::conductor' do
is_expected.to contain_ironic_config('deploy/http_root').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('conductor/configdrive_use_swift').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('conductor/configdrive_swift_container').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('conductor/inspect_timeout').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('deploy/default_boot_option').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('neutron/port_setup_delay').with(:value => '<SERVICE DEFAULT>')
end

1
spec/classes/ironic_inspector_spec.rb
View File

@ -101,6 +101,7 @@ describe 'ironic::inspector' do
it 'configures inspector.conf' do
is_expected.to contain_ironic_inspector_config('DEFAULT/listen_address').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_inspector_config('DEFAULT/auth_strategy').with_value(p[:auth_strategy])
is_expected.to contain_ironic_inspector_config('DEFAULT/timeout').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_inspector_config('capabilities/boot_mode').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_inspector_config('firewall/dnsmasq_interface').with_value(p[:dnsmasq_interface])
is_expected.to contain_ironic_inspector_config('processing/ramdisk_logs_dir').with_value(p[:ramdisk_logs_dir])