diff --git a/ansible/roles/ironic/tasks/config.yml b/ansible/roles/ironic/tasks/config.yml index 464507ef0d..c17f2c335d 100644 --- a/ansible/roles/ironic/tasks/config.yml +++ b/ansible/roles/ironic/tasks/config.yml @@ -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 diff --git a/ansible/roles/ironic/tasks/precheck.yml b/ansible/roles/ironic/tasks/precheck.yml index 7f7af51c4f..19190b5b28 100644 --- a/ansible/roles/ironic/tasks/precheck.yml +++ b/ansible/roles/ironic/tasks/precheck.yml @@ -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" diff --git a/ansible/roles/ironic/templates/ironic-tftp.json.j2 b/ansible/roles/ironic/templates/ironic-tftp.json.j2 index 24b0545920..8526aea56b 100644 --- a/ansible/roles/ironic/templates/ironic-tftp.json.j2 +++ b/ansible/roles/ironic/templates/ironic-tftp.json.j2 @@ -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 }}",