openstack
/
puppet-ironic
Code Issues Proposed changes

Adding detect_boot_mode option 

Allow users to update the boot_mode in ironic inspector. Default is set
to $::os_service_default (false).

Change-Id: I9a1c558790560f4ba7feebf41f46d3b9231a5250
This commit is contained in:
Joe Talerico 2016-11-11 10:09:30 -05:00
parent 0bada7856c
commit 17634d7969
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/inspector.pp
View File

@ -159,6 +159,10 @@
# (optional) Folder location to deploy HTTP PXE boot
# Defaults to '/httpboot'
#
# [*detect_boot_mode*]
# (optional) Whether to store the boot mode (BIOS or UEFI).
# Defaults to $::os_service_default
#
# DEPRECATED PARAMETERS
#
# [*identity_uri*]
@ -215,6 +219,7 @@ class ironic::inspector (
$ramdisk_kernel_args = undef,
$ipxe_timeout = $::os_service_default,
$http_port = '8088',
$detect_boot_mode = $::os_service_default,
$tftp_root = '/tftpboot',
$http_root = '/httpboot',
# DEPRECATED PARAMETERS
@ -317,6 +322,7 @@ tftpboot and httpboot setup, please include ::ironic::pxe")
ironic_inspector_config {
'DEFAULT/listen_address': value => $listen_address;
'DEFAULT/auth_strategy': value => $auth_strategy;
'capabilities/boot_mode': value => $detect_boot_mode;
'firewall/dnsmasq_interface': value => $dnsmasq_interface;
'processing/ramdisk_logs_dir': value => $ramdisk_logs_dir;
'processing/enable_setting_ipmi_credentials': value => $enable_setting_ipmi_credentials;

4
releasenotes/notes/adding_inspector_boot_mode-5bb8a41e75c33622.yaml Normal file
View File

@ -0,0 +1,4 @@
---
features:
- Add "ironic::inspector::detect_boot_mode" parameter to configure
whether to store the boot mode (BIOS or UEFI).

3
spec/classes/ironic_inspector_spec.rb
View File

@ -93,6 +93,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('capabilities/boot_mode').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_inspector_config('keystone_authtoken/auth_type').with_value('password')
is_expected.to contain_ironic_inspector_config('keystone_authtoken/auth_uri').with_value(p[:auth_uri])
is_expected.to contain_ironic_inspector_config('keystone_authtoken/auth_url').with_value(p[:identity_uri])
@ -163,11 +164,13 @@ describe 'ironic::inspector' do
:http_port => 3816,
:tftp_root => '/var/lib/tftpboot',
:http_root => '/var/www/httpboot',
:detect_boot_mode => true,
)
end
it 'should replace default parameter with new value' do
is_expected.to contain_ironic_inspector_config('DEFAULT/listen_address').with_value(p[:listen_address])
is_expected.to contain_ironic_inspector_config('DEFAULT/debug').with_value(p[:debug])
is_expected.to contain_ironic_inspector_config('capabilities/boot_mode').with_value(p[:detect_boot_mode])
is_expected.to contain_ironic_inspector_config('keystone_authtoken/auth_uri').with_value(p[:auth_uri])
is_expected.to contain_ironic_inspector_config('keystone_authtoken/auth_url').with_value(p[:identity_uri])
is_expected.to contain_ironic_inspector_config('keystone_authtoken/password').with_value(p[:admin_password])