From 3218eb58910507af3fd1f8da322640739074b306 Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Mon, 11 Jul 2022 14:01:38 +1200
Subject: [PATCH] Remove enable_uefi_ipxe

Parameter ``enable_uefi_ipxe`` has been removed, instead
``enabled_boot_interfaces`` is checked for containing ``ipxe``.

Change-Id: Id47d596750319d8e2889dff9741c6ef4e790ad56
---
 playbooks/roles/bifrost-ironic-install/defaults/main.yml     | 1 -
 .../roles/bifrost-ironic-install/tasks/create_tftpboot.yml   | 2 +-
 playbooks/roles/bifrost-ironic-install/tasks/get_ipxe.yml    | 2 +-
 .../roles/bifrost-ironic-install/templates/dnsmasq.conf.j2   | 2 +-
 .../roles/bifrost-ironic-install/templates/ironic.conf.j2    | 2 +-
 .../notes/remove-enable_uefi_ipxe-407dde288ebfafd3.yaml      | 5 +++++
 6 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 releasenotes/notes/remove-enable_uefi_ipxe-407dde288ebfafd3.yaml

diff --git a/playbooks/roles/bifrost-ironic-install/defaults/main.yml b/playbooks/roles/bifrost-ironic-install/defaults/main.yml
index e29fe6521..30f86900a 100644
--- a/playbooks/roles/bifrost-ironic-install/defaults/main.yml
+++ b/playbooks/roles/bifrost-ironic-install/defaults/main.yml
@@ -70,7 +70,6 @@ ipa_file_protocol: "http"
 ipa_upstream_release: "master"
 use_tinyipa: false
 
-enable_uefi_ipxe: true
 ipxe_efi_binary: ipxe.efi
 
 tarballs_base_url: "https://tarballs.opendev.org/openstack/ironic-python-agent"
diff --git a/playbooks/roles/bifrost-ironic-install/tasks/create_tftpboot.yml b/playbooks/roles/bifrost-ironic-install/tasks/create_tftpboot.yml
index 21583b458..adde258cf 100644
--- a/playbooks/roles/bifrost-ironic-install/tasks/create_tftpboot.yml
+++ b/playbooks/roles/bifrost-ironic-install/tasks/create_tftpboot.yml
@@ -174,7 +174,7 @@
         mode: 0644
         remote_src: true
 
-  when: enable_uefi_ipxe | bool
+  when: "'ipxe' in enabled_boot_interfaces.split(',')"
 
 # Similar logic to below can be utilized to retrieve files
 - name: "Determine if folder exists, else create and populate folder."
diff --git a/playbooks/roles/bifrost-ironic-install/tasks/get_ipxe.yml b/playbooks/roles/bifrost-ironic-install/tasks/get_ipxe.yml
index b4c34b002..641853dc1 100644
--- a/playbooks/roles/bifrost-ironic-install/tasks/get_ipxe.yml
+++ b/playbooks/roles/bifrost-ironic-install/tasks/get_ipxe.yml
@@ -51,4 +51,4 @@
   delay: 10
   loop:
     - "{{ ipxe_efi_binary }}"
-  when: enable_uefi_ipxe | bool
+  when: "'ipxe' in enabled_boot_interfaces.split(',')"
diff --git a/playbooks/roles/bifrost-ironic-install/templates/dnsmasq.conf.j2 b/playbooks/roles/bifrost-ironic-install/templates/dnsmasq.conf.j2
index 83252f594..fe336cb99 100644
--- a/playbooks/roles/bifrost-ironic-install/templates/dnsmasq.conf.j2
+++ b/playbooks/roles/bifrost-ironic-install/templates/dnsmasq.conf.j2
@@ -97,7 +97,7 @@ dhcp-optsdir={{ dnsmasq_dhcp_optsdir }}
 dhcp-userclass=set:gpxe,"gPXE"
 dhcp-boot=tag:gpxe,/ipxe.pxe
 
-{% if enable_uefi_ipxe | bool == true %}
+{% if 'ipxe' in enabled_boot_interfaces.split(',') %}
 dhcp-match=set:efi,option:client-arch,7
 dhcp-match=set:efi,option:client-arch,9
 dhcp-match=set:efi,option:client-arch,11
diff --git a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
index d2c21f82c..a61e7bf37 100644
--- a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
+++ b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
@@ -82,7 +82,7 @@ tftp_server = {{ internal_ip }}
 tftp_root = {{ tftp_boot_folder }}
 ipxe_fallback_script = pxelinux.cfg/default
 tftp_master_path = {{ ironic_tftp_master_path }}
-{% if enable_uefi_ipxe | bool %}
+{% if 'ipxe' in enabled_boot_interfaces.split(',') %}
 uefi_ipxe_bootfile_name = {{ ipxe_efi_binary }}
 {% endif %}
 enable_netboot_fallback = true
diff --git a/releasenotes/notes/remove-enable_uefi_ipxe-407dde288ebfafd3.yaml b/releasenotes/notes/remove-enable_uefi_ipxe-407dde288ebfafd3.yaml
new file mode 100644
index 000000000..699e5e287
--- /dev/null
+++ b/releasenotes/notes/remove-enable_uefi_ipxe-407dde288ebfafd3.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Variable ``enable_uefi_ipxe`` has been removed, instead
+    ``enabled_boot_interfaces`` is checked for containing ``ipxe``.