openstack/puppet-ironic
Code Issues Proposed changes

Allow configuring default_boot_option

Browse Source 
Change-Id: I4d7dca4a64e5819da81b0d2ce689b994d0557736
Related-Bug: #1619339
This commit is contained in:
Dmitry Tantsur
2016-10-13 14:00:29 +02:00
parent 18cc687589
commit 5a44afdd02
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/conductor.pp
View File

@@ -106,6 +106,11 @@
# configdrive_use_swift is true.
# 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".
# Defaults to $::os_service_default
#
class ironic::conductor (
$package_ensure = 'present',
$enabled = true,
@@ -125,6 +130,7 @@ class ironic::conductor (
$provisioning_network_uuid = $::os_service_default,
$configdrive_use_swift = $::os_service_default,
$configdrive_swift_container = $::os_service_default,
$default_boot_option = $::os_service_default,
) {
include ::ironic::deps
@@ -195,6 +201,7 @@ class ironic::conductor (
'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;
'deploy/default_boot_option': value => $default_boot_option;
}
# Install package

10
releasenotes/notes/default_boot_option-09992dff723b9167.yaml Normal file
View File

@@ -0,0 +1,10 @@
---
features:
- Add "ironic::conductor::default_boot_option" parameter to configure the
default boot option for nodes.
upgrade:
- |
Is is recommended to set ``ironic::conductor::default_boot_option``
to an explicit value, as it's default value will change in the future from
"netboot" to "local". See `bug 1619339
<https://bugs.launchpad.net/ironic/+bug/1619339>`_ for details.

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('deploy/default_boot_option').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',
:default_boot_option => 'local',
)
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('deploy/default_boot_option').with_value(p[:default_boot_option])
end
end