ironic: Remove enable_ironic_pxe_uefi bits
These were missed in I081aa1345603fa27c390e4e09231a5ff226bcb39 Change-Id: I2884bca3c06ff98004e318757a20b60c12375924
This commit is contained in:
parent
16928ceddf
commit
d8700ad013
@ -142,30 +142,10 @@
|
|||||||
- groups['ironic-inspector'] | length > 0
|
- groups['ironic-inspector'] | length > 0
|
||||||
- inventory_hostname in groups[service.group]
|
- inventory_hostname in groups[service.group]
|
||||||
- service.enabled | bool
|
- service.enabled | bool
|
||||||
- not enable_ironic_pxe_uefi | bool
|
|
||||||
- not ironic_dnsmasq_serve_ipxe | bool
|
- not ironic_dnsmasq_serve_ipxe | bool
|
||||||
notify:
|
notify:
|
||||||
- Restart ironic-tftp container
|
- 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)
|
- name: Copying ironic-agent kernel and initramfs (PXE)
|
||||||
vars:
|
vars:
|
||||||
service: "{{ ironic_services['ironic-tftp'] }}"
|
service: "{{ ironic_services['ironic-tftp'] }}"
|
||||||
@ -182,7 +162,6 @@
|
|||||||
- groups['ironic-inspector'] | length > 0
|
- groups['ironic-inspector'] | length > 0
|
||||||
- inventory_hostname in groups[service.group]
|
- inventory_hostname in groups[service.group]
|
||||||
- service.enabled | bool
|
- service.enabled | bool
|
||||||
- not enable_ironic_pxe_uefi | bool
|
|
||||||
- not ironic_dnsmasq_serve_ipxe | bool
|
- not ironic_dnsmasq_serve_ipxe | bool
|
||||||
notify:
|
notify:
|
||||||
- Restart ironic-tftp container
|
- Restart ironic-tftp container
|
||||||
|
@ -73,7 +73,6 @@
|
|||||||
- groups['ironic-inspector'] | length > 0
|
- groups['ironic-inspector'] | length > 0
|
||||||
- (not ironic_dnsmasq_serve_ipxe | bool and inventory_hostname in groups['ironic-tftp']) or
|
- (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'])
|
(ironic_dnsmasq_serve_ipxe | bool and inventory_hostname in groups['ironic-http'])
|
||||||
- not enable_ironic_pxe_uefi | bool
|
|
||||||
with_items:
|
with_items:
|
||||||
- "ironic-agent.kernel"
|
- "ironic-agent.kernel"
|
||||||
- "ironic-agent.initramfs"
|
- "ironic-agent.initramfs"
|
||||||
|
@ -1,20 +1,10 @@
|
|||||||
{% if enable_ironic_pxe_uefi | bool %}
|
{% set pxe_dir = '/var/lib/ironic/tftpboot/pxelinux.cfg' %}
|
||||||
{% if kolla_base_distro in ['debian', 'ubuntu'] %}
|
{% set pxe_cfg = 'default' %}
|
||||||
{% 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' %}
|
|
||||||
|
|
||||||
{
|
{
|
||||||
"command": "/usr/sbin/in.tftpd --verbose --foreground --user nobody --address {{ ironic_tftp_listen_address }}:69 --map-file /map-file /var/lib/ironic/tftpboot",
|
"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": [
|
"config_files": [
|
||||||
{% if not ironic_dnsmasq_serve_ipxe | bool and groups['ironic-inspector'] | length > 0 %}
|
{% 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",
|
"source": "{{ container_config_directory }}/ironic-agent.kernel",
|
||||||
"dest": "/var/lib/ironic/tftpboot/ironic-agent.kernel",
|
"dest": "/var/lib/ironic/tftpboot/ironic-agent.kernel",
|
||||||
@ -27,7 +17,6 @@
|
|||||||
"owner": "root",
|
"owner": "root",
|
||||||
"perm": "0644"
|
"perm": "0644"
|
||||||
},
|
},
|
||||||
{% endif %}
|
|
||||||
{
|
{
|
||||||
"source": "{{ container_config_directory }}/default",
|
"source": "{{ container_config_directory }}/default",
|
||||||
"dest": "{{ pxe_dir }}/{{ pxe_cfg }}",
|
"dest": "{{ pxe_dir }}/{{ pxe_cfg }}",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user