ironic: Remove enable_ironic_pxe_uefi bits

These were missed in I081aa1345603fa27c390e4e09231a5ff226bcb39

Change-Id: I2884bca3c06ff98004e318757a20b60c12375924
This commit is contained in:
Michal Nasiadka 2024-01-03 15:22:18 +01:00 committed by Mark Goddard
parent 16928ceddf
commit d8700ad013
3 changed files with 2 additions and 35 deletions

View File

@ -142,30 +142,10 @@
- groups['ironic-inspector'] | length > 0
- inventory_hostname in groups[service.group]
- service.enabled | bool
- not enable_ironic_pxe_uefi | bool
- not ironic_dnsmasq_serve_ipxe | bool
notify:
- Restart ironic-tftp container
- name: Copying ironic_pxe_uefi.cfg default
vars:
service: "{{ ironic_services['ironic-tftp'] }}"
template:
src: "{{ item }}"
dest: "{{ node_config_directory }}/ironic-tftp/default"
mode: "0660"
become: true
with_first_found:
- "{{ node_custom_config }}/ironic/ironic_pxe_uefi.default"
- "{{ node_custom_config }}/ironic/{{ inventory_hostname }}/ironic_pxe_uefi.default"
- "ironic_pxe_uefi.default.j2"
when:
- inventory_hostname in groups[service.group]
- service.enabled | bool
- enable_ironic_pxe_uefi | bool
notify:
- Restart ironic-tftp container
- name: Copying ironic-agent kernel and initramfs (PXE)
vars:
service: "{{ ironic_services['ironic-tftp'] }}"
@ -182,7 +162,6 @@
- groups['ironic-inspector'] | length > 0
- inventory_hostname in groups[service.group]
- service.enabled | bool
- not enable_ironic_pxe_uefi | bool
- not ironic_dnsmasq_serve_ipxe | bool
notify:
- Restart ironic-tftp container

View File

@ -73,7 +73,6 @@
- groups['ironic-inspector'] | length > 0
- (not ironic_dnsmasq_serve_ipxe | bool and inventory_hostname in groups['ironic-tftp']) or
(ironic_dnsmasq_serve_ipxe | bool and inventory_hostname in groups['ironic-http'])
- not enable_ironic_pxe_uefi | bool
with_items:
- "ironic-agent.kernel"
- "ironic-agent.initramfs"

View File

@ -1,20 +1,10 @@
{% if enable_ironic_pxe_uefi | bool %}
{% if kolla_base_distro in ['debian', 'ubuntu'] %}
{% set pxe_dir = '/var/lib/ironic/tftpboot/grub' %}
{% elif kolla_base_distro in ['centos', 'rocky'] %}
{% set pxe_dir = '/var/lib/ironic/tftpboot/EFI/{{ kolla_base_distro }}' %}
{% endif %}
{% else %}
{% set pxe_dir = '/var/lib/ironic/tftpboot/pxelinux.cfg' %}
{% endif %}
{% set pxe_cfg = 'grub.cfg' if enable_ironic_pxe_uefi | bool else 'default' %}
{% set pxe_dir = '/var/lib/ironic/tftpboot/pxelinux.cfg' %}
{% set pxe_cfg = 'default' %}
{
"command": "/usr/sbin/in.tftpd --verbose --foreground --user nobody --address {{ ironic_tftp_listen_address }}:69 --map-file /map-file /var/lib/ironic/tftpboot",
"config_files": [
{% if not ironic_dnsmasq_serve_ipxe | bool and groups['ironic-inspector'] | length > 0 %}
{% if not enable_ironic_pxe_uefi | bool %}
{
"source": "{{ container_config_directory }}/ironic-agent.kernel",
"dest": "/var/lib/ironic/tftpboot/ironic-agent.kernel",
@ -27,7 +17,6 @@
"owner": "root",
"perm": "0644"
},
{% endif %}
{
"source": "{{ container_config_directory }}/default",
"dest": "{{ pxe_dir }}/{{ pxe_cfg }}",