From 5daa9edd96eebde8b6866f362006fae46df27f6a Mon Sep 17 00:00:00 2001
From: David Vallee Delisle <dvd@redhat.com>
Date: Tue, 4 May 2021 11:31:22 -0400
Subject: [PATCH] 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
---
 manifests/drivers/pxe.pp                | 2 +-
 spec/classes/ironic_drivers_pxe_spec.rb | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/manifests/drivers/pxe.pp b/manifests/drivers/pxe.pp
index 39456992..ce4e2daa 100644
--- a/manifests/drivers/pxe.pp
+++ b/manifests/drivers/pxe.pp
@@ -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 {
diff --git a/spec/classes/ironic_drivers_pxe_spec.rb b/spec/classes/ironic_drivers_pxe_spec.rb
index b874edd0..4137be20 100644
--- a/spec/classes/ironic_drivers_pxe_spec.rb
+++ b/spec/classes/ironic_drivers_pxe_spec.rb
@@ -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])