diff --git a/ansible/roles/ironic/tasks/config.yml b/ansible/roles/ironic/tasks/config.yml index e3efcde0cd36f131945bb108d761cc5c76a0f384..cf3eecdf102a74f0faf691bb520de1a4ab821eb6 100644 --- a/ansible/roles/ironic/tasks/config.yml +++ b/ansible/roles/ironic/tasks/config.yml @@ -78,6 +78,7 @@ with_items: - "ironic-agent.kernel" - "ironic-agent.initramfs" + when: orchestration_engine != 'KUBERNETES' - name: Check if policies shall be overwritten local_action: stat path="{{ node_custom_config }}/ironic/policy.json" diff --git a/ansible/roles/ironic/templates/ironic-dnsmasq.conf.j2 b/ansible/roles/ironic/templates/ironic-dnsmasq.conf.j2 index df0019a0ea810eeb700d6911947889c0cb4e3cb2..d121761361453f7c5bec2712232df62484f0b0ca 100644 --- a/ansible/roles/ironic/templates/ironic-dnsmasq.conf.j2 +++ b/ansible/roles/ironic/templates/ironic-dnsmasq.conf.j2 @@ -1,10 +1,16 @@ port=0 +{% if orchestration_engine != 'KUBERNETES' %} interface={{ api_interface }} -bind-interfaces dhcp-range={{ ironic_dnsmasq_dhcp_range }} -dhcp-sequential-ip - dhcp-option=option:tftp-server,{{ kolla_internal_vip_address }} dhcp-option=option:server-ip-address,{{ kolla_internal_vip_address }} +{% else %} +interface=undefined +dhcp-range= +dhcp-option=option:tftp-server,undefined +dhcp-option=option:server-ip-address,undefined +{% endif %} +bind-interfaces +dhcp-sequential-ip dhcp-option=option:bootfile-name,pxelinux.0 dhcp-option=210,/tftpboot/ diff --git a/ansible/roles/ironic/templates/ironic-pxe.json.j2 b/ansible/roles/ironic/templates/ironic-pxe.json.j2 index 74c4295ca4cd456aa2b380dab986d680c9db97f5..b6ebcb6e29a2a7315d5e59538c3631830b791d61 100644 --- a/ansible/roles/ironic/templates/ironic-pxe.json.j2 +++ b/ansible/roles/ironic/templates/ironic-pxe.json.j2 @@ -1,6 +1,7 @@ { "command": "/usr/sbin/in.tftpd --verbose --foreground --user root --address 0.0.0.0:69 --map-file /map-file /tftpboot", "config_files": [ +{% if orchestration_engine != 'KUBERNETES' %} { "source": "{{ container_config_directory }}/ironic-agent.kernel", "dest": "/tftpboot/ironic-agent.kernel", @@ -13,6 +14,7 @@ "owner": "root", "perm": "0644" }, +{% endif %} { "source": "{{ container_config_directory }}/default", "dest": "/tftpboot/pxelinux.cfg/default", diff --git a/ansible/roles/ironic/templates/pxelinux.default.j2 b/ansible/roles/ironic/templates/pxelinux.default.j2 index 5304611a3d9bf929aef9c9733dbadcdb6a68b29e..192c2a1f309ed0f07cb0f6cb1902ecb5ae63601a 100644 --- a/ansible/roles/ironic/templates/pxelinux.default.j2 +++ b/ansible/roles/ironic/templates/pxelinux.default.j2 @@ -2,6 +2,10 @@ default introspect label introspect kernel ironic-agent.kernel +{% if orchestration_engine != 'KUBERNETES' %} append initrd=ironic-agent.initramfs ipa-inspection-callback-url=http://{{ kolla_internal_vip_address }}:{{ ironic_inspector_port }}/v1/continue systemd.journald.forward_to_console=yes +{% else %} +append initrd=ironic-agent.initramfs ipa-inspection-callback-url=http://ironic-inspector:{{ ironic_inspector_port }}/v1/continue systemd.journald.forward_to_console=yes +{% endif %} ipappend 3