openstack
/
puppet-ironic
Code Issues Proposed changes

expose the ipxe_enabled parameter 

This parameter defines is IPXE should by used instead of the standard
PXE client.

Change-Id: Idbab91c3915c958f0ee1d7cd4d85748fd82ef9ed
This commit is contained in:
Gonéri Le Bouder 2016-03-23 16:31:17 -04:00
parent 212b97f094
commit 51e0ac5593
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/drivers/pxe.pp
View File

@ -81,6 +81,10 @@
# (optional) ipxe timeout in second.
# Should be an valid integer
# Defaults to '0' for unlimited.
#
# [*ipxe_enabled*]
# (optional) Enable ipxe support
# Defaults to $::os_service_default.
class ironic::drivers::pxe (
$deploy_kernel = undef,
@ -96,6 +100,7 @@ class ironic::drivers::pxe (
$uefi_pxe_bootfile_name = 'elilo.efi',
$uefi_pxe_config_template = '$pybasedir/drivers/modules/elilo_efi_pxe_config.template',
$ipxe_timeout = '0',
$ipxe_enabled = $::os_service_default,
) {
# Configure ironic.conf
@ -111,6 +116,7 @@ class ironic::drivers::pxe (
'pxe/uefi_pxe_bootfile_name': value => $uefi_pxe_bootfile_name;
'pxe/uefi_pxe_config_template': value => $uefi_pxe_config_template;
'pxe/ipxe_timeout': value => $ipxe_timeout;
'pxe/ipxe_enabled': value => $ipxe_enabled;
}
if $deploy_kernel {

7
spec/classes/ironic_drivers_pxe_spec.rb
View File

@ -33,7 +33,7 @@ describe 'ironic::drivers::pxe' do
:instance_master_path => '/var/lib/ironic/master_images',
:uefi_pxe_bootfile_name => 'elilo.efi',
:uefi_pxe_config_template => '$pybasedir/drivers/modules/elilo_efi_pxe_config.template',
:ipxe_timeout => 0
:ipxe_timeout => 0,
}
end
@ -57,6 +57,7 @@ describe 'ironic::drivers::pxe' do
is_expected.to contain_ironic_config('pxe/instance_master_path').with_value(p[:instance_master_path])
is_expected.to contain_ironic_config('pxe/uefi_pxe_bootfile_name').with_value(p[:uefi_pxe_bootfile_name])
is_expected.to contain_ironic_config('pxe/uefi_pxe_config_template').with_value(p[:uefi_pxe_config_template])
is_expected.to contain_ironic_config('pxe/ipxe_enabled').with_value('<SERVICE DEFAULT>')
end
context 'when overriding parameters' do
@ -74,7 +75,8 @@ describe 'ironic::drivers::pxe' do
:instance_master_path => '/mnt/ironic/master_images',
:uefi_pxe_bootfile_name => 'bootx64.efi',
:uefi_pxe_config_template => 'foo-uefi',
:ipxe_timeout => '60'
:ipxe_timeout => '60',
:ipxe_enabled => true
)
end
@ -92,6 +94,7 @@ describe 'ironic::drivers::pxe' do
is_expected.to contain_ironic_config('pxe/uefi_pxe_bootfile_name').with_value(p[:uefi_pxe_bootfile_name])
is_expected.to contain_ironic_config('pxe/uefi_pxe_config_template').with_value(p[:uefi_pxe_config_template])
is_expected.to contain_ironic_config('pxe/ipxe_timeout').with_value(p[:ipxe_timeout])
is_expected.to contain_ironic_config('pxe/ipxe_enabled').with_value(p[:ipxe_enabled])
end
end