openstack
/
puppet-ironic
Code Issues Proposed changes

We shouldn't set pxe/ipxe_enabled in ironic config 

This parameter was removed a while ago [1]

[1] https://review.opendev.org/c/openstack/ironic/+/696810

Change-Id: I81e64148b3ad276633b84e436682fc1b78bfdd7f
(cherry picked from commit 5daa9edd96)
This commit is contained in:
David Vallee Delisle 2021-05-04 11:31:22 -04:00 committed by Takashi Kajinami
parent 122bd74ff1
commit fc299c77c9
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/drivers/pxe.pp
View File

@ -127,7 +127,6 @@ class ironic::drivers::pxe (
# Configure ironic.conf
ironic_config {
'pxe/ipxe_enabled': value => $ipxe_enabled;
'pxe/pxe_append_params': value => $pxe_append_params;
'pxe/pxe_bootfile_name': value => $pxe_bootfile_name_real;
'pxe/pxe_config_template': value => $pxe_config_template_real;
@ -142,6 +141,7 @@ class ironic::drivers::pxe (
'pxe/boot_retry_timeout': value => $boot_retry_timeout;
'pxe/boot_retry_check_interval': value => $boot_retry_check_interval;
'pxe/ip_version': value => $ip_version;
'pxe/ipxe_enabled': ensure => absent;
}
if $enable_ppc64le {

4
spec/classes/ironic_drivers_pxe_spec.rb
View File

@ -50,7 +50,7 @@ describe 'ironic::drivers::pxe' do
is_expected.to contain_ironic_config('pxe/instance_master_path').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('pxe/uefi_pxe_bootfile_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('pxe/uefi_pxe_config_template').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('pxe/ipxe_enabled').with_value(false)
is_expected.to contain_ironic_config('pxe/ipxe_enabled').with_ensure('absent')
end
context 'when overriding only ipxe_enabled' do
@ -71,7 +71,6 @@ describe 'ironic::drivers::pxe' do
is_expected.to contain_ironic_config('pxe/instance_master_path').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('pxe/uefi_pxe_bootfile_name').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('pxe/uefi_pxe_config_template').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('pxe/ipxe_enabled').with_value(true)
end
end
@ -120,7 +119,6 @@ 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])
is_expected.to contain_ironic_config('pxe/pxe_bootfile_name').with_value(p[:pxe_bootfile_name])
is_expected.to contain_ironic_config('pxe/boot_retry_timeout').with_value(p[:boot_retry_timeout])
is_expected.to contain_ironic_config('pxe/boot_retry_check_interval').with_value(p[:boot_retry_check_interval])