openstack
/
puppet-ironic
Code Issues Proposed changes

Allow to set port_setup_delay ironic::conductor param 

This patch allows to configure port_setup_delay by setting
::ironic::config::port_setup_delay variable.

(cherry picked from commit 507d387713)

Change-Id: I53548ac2c47296aef5553477a522ab764c2a67bd
This commit is contained in:
Vasyl Saienko 2017-03-29 12:06:01 +03:00
parent f28efb9a55
commit f63c1c7efc
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

@ -125,6 +125,11 @@
# Can not be specified together with provisioning_network.
# Defaults to undef, which leaves the configuration intact
#
# [*port_setup_delay*]
# (optional) Delay value to wait for Neutron agents to setup
# sufficient DHCP configuration for port.
# Defaults to $::os_service_default
#
# DEPRECATED
#
# [*cleaning_network_uuid*]
@ -155,6 +160,7 @@ class ironic::conductor (
$configdrive_use_swift = $::os_service_default,
$configdrive_swift_container = $::os_service_default,
$default_boot_option = $::os_service_default,
$port_setup_delay = $::os_service_default,
$cleaning_network_name = undef,
$provisioning_network_name = undef,
# DEPRECATED
@ -248,6 +254,7 @@ specified in the same time.")
'conductor/configdrive_use_swift': value => $configdrive_use_swift;
'conductor/configdrive_swift_container': value => $configdrive_swift_container;
'deploy/default_boot_option': value => $default_boot_option;
'neutron/port_setup_delay': value => $port_setup_delay;
}
if $cleaning_network_name {

5
releasenotes/notes/add_port_setup_delay_param-e28595863d31117e.yaml Normal file
View File

@ -0,0 +1,5 @@
---
features:
- Add port_setup_delay parameter to ::ironic::conductor
class. Defines delay value to wait for Neutron agents
to setup sufficient DHCP configuration.

3
spec/classes/ironic_conductor_spec.rb
View File

@ -78,6 +78,7 @@ describe 'ironic::conductor' do
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('deploy/default_boot_option').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('neutron/port_setup_delay').with(:value => '<SERVICE DEFAULT>')
end
context 'when overriding parameters' do
@ -99,6 +100,7 @@ describe 'ironic::conductor' do
:configdrive_use_swift => true,
:configdrive_swift_container => 'cont',
:default_boot_option => 'local',
:port_setup_delay => '15',
)
end
it 'should replace default parameter with new value' do
@ -119,6 +121,7 @@ describe 'ironic::conductor' do
is_expected.to contain_ironic_config('conductor/configdrive_use_swift').with_value(p[:configdrive_use_swift])
is_expected.to contain_ironic_config('conductor/configdrive_swift_container').with_value(p[:configdrive_swift_container])
is_expected.to contain_ironic_config('deploy/default_boot_option').with_value(p[:default_boot_option])
is_expected.to contain_ironic_config('neutron/port_setup_delay').with_value(p[:port_setup_delay])
end
end