openstack/bifrost
Code Issues Proposed changes

Merge "Remove enable_uefi_ipxe"

Browse Source
This commit is contained in:
Zuul 2023-01-23 18:07:22 +00:00 committed by Gerrit Code Review
commit 29f31b22af
6 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
playbooks/roles/bifrost-ironic-install/defaults/main.yml
View File

@ -70,7 +70,6 @@ ipa_file_protocol: "http"
ipa_upstream_release: "master" ipa_upstream_release: "master"
use_tinyipa: false use_tinyipa: false
enable_uefi_ipxe: true
ipxe_efi_binary: ipxe.efi ipxe_efi_binary: ipxe.efi
tarballs_base_url: "https://tarballs.opendev.org/openstack/ironic-python-agent" tarballs_base_url: "https://tarballs.opendev.org/openstack/ironic-python-agent"

2
playbooks/roles/bifrost-ironic-install/tasks/create_tftpboot.yml
View File

@ -174,7 +174,7 @@
mode: 0644 mode: 0644
remote_src: true 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 # Similar logic to below can be utilized to retrieve files
- name: "Determine if folder exists, else create and populate folder." - name: "Determine if folder exists, else create and populate folder."

2
playbooks/roles/bifrost-ironic-install/tasks/get_ipxe.yml
View File

@ -51,4 +51,4 @@
delay: 10 delay: 10
loop: loop:
- "{{ ipxe_efi_binary }}" - "{{ ipxe_efi_binary }}"
when: enable_uefi_ipxe | bool when: "'ipxe' in enabled_boot_interfaces.split(',')"

2
playbooks/roles/bifrost-ironic-install/templates/dnsmasq.conf.j2
View File

@ -97,7 +97,7 @@ dhcp-optsdir={{ dnsmasq_dhcp_optsdir }}
dhcp-userclass=set:gpxe,"gPXE" dhcp-userclass=set:gpxe,"gPXE"
dhcp-boot=tag:gpxe,/ipxe.pxe 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,7
dhcp-match=set:efi,option:client-arch,9 dhcp-match=set:efi,option:client-arch,9
dhcp-match=set:efi,option:client-arch,11 dhcp-match=set:efi,option:client-arch,11

2
playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
View File

@ -82,7 +82,7 @@ tftp_server = {{ internal_ip }}
tftp_root = {{ tftp_boot_folder }} tftp_root = {{ tftp_boot_folder }}
ipxe_fallback_script = pxelinux.cfg/default ipxe_fallback_script = pxelinux.cfg/default
tftp_master_path = {{ ironic_tftp_master_path }} 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 }} uefi_ipxe_bootfile_name = {{ ipxe_efi_binary }}
{% endif %} {% endif %}
enable_netboot_fallback = true enable_netboot_fallback = true

5
releasenotes/notes/remove-enable_uefi_ipxe-407dde288ebfafd3.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
Variable ``enable_uefi_ipxe`` has been removed, instead
``enabled_boot_interfaces`` is checked for containing ``ipxe``.