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: I9bdb0f2fbbb9dbc918cb8b4ec1d97a42b4f312b5
This commit is contained in:
Vasyl Saienko 2017-03-29 12:51:07 +03:00
parent 22acdd3e88
commit dfa53a895f
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

@ -120,6 +120,11 @@
# Can not be specified together with provisioning_network_uuid.
# 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
#
class ironic::conductor (
$package_ensure = 'present',
$enabled = true,
@ -139,6 +144,7 @@ class ironic::conductor (
$provisioning_network_uuid = $::os_service_default,
$configdrive_use_swift = $::os_service_default,
$configdrive_swift_container = $::os_service_default,
$port_setup_delay = $::os_service_default,
$cleaning_network_name = undef,
$provisioning_network_name = undef,
) {
@ -219,6 +225,7 @@ specified in the same time.")
'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;
'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

@ -77,6 +77,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('neutron/port_setup_delay').with(:value => '<SERVICE DEFAULT>')
end
context 'when overriding parameters' do
@ -97,6 +98,7 @@ describe 'ironic::conductor' do
:http_root => '/src/www',
:configdrive_use_swift => true,
:configdrive_swift_container => 'cont',
:port_setup_delay => '15',
)
end
it 'should replace default parameter with new value' do
@ -116,6 +118,7 @@ describe 'ironic::conductor' do
is_expected.to contain_ironic_config('deploy/http_root').with_value(p[:http_root])
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('neutron/port_setup_delay').with_value(p[:port_setup_delay])
end
end