From 835a4873c0dd5ab5f465e70fde35643655b99119 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Tue, 16 Jun 2020 16:52:21 +0200 Subject: [PATCH] Fix fast-track deployment after discovery/inspection The inspection ramdisk configuration does not include ipa-api-url, so deployment/cleaning won't start without a reboot. Change-Id: I90149a522d6879bd5c2271bf3265ca7897233e1b --- .../templates/inspector-default-boot-ipxe.j2 | 2 +- .../notes/fast-track-inspection-a28a062e86f06190.yaml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/fast-track-inspection-a28a062e86f06190.yaml diff --git a/playbooks/roles/bifrost-ironic-install/templates/inspector-default-boot-ipxe.j2 b/playbooks/roles/bifrost-ironic-install/templates/inspector-default-boot-ipxe.j2 index f89610f4b..5bc3d9077 100644 --- a/playbooks/roles/bifrost-ironic-install/templates/inspector-default-boot-ipxe.j2 +++ b/playbooks/roles/bifrost-ironic-install/templates/inspector-default-boot-ipxe.j2 @@ -5,6 +5,6 @@ dhcp || reboot goto introspect :introspect -kernel {{ ipa_kernel_url }} ipa-inspection-callback-url=http://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface ]['ipv4']['address'] }}:5050/v1/continue systemd.journald.forward_to_console=yes BOOTIF=${mac} nofb nomodeset vga=normal console=ttyS0 {{ inspector_extra_kernel_options | default('') }} initrd={{ ipa_ramdisk_url | basename }} +kernel {{ ipa_kernel_url }} ipa-inspection-callback-url=http://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface ]['ipv4']['address'] }}:5050/v1/continue {% if fast_track | bool %}ipa-api-url=http://{{ hostvars[inventory_hostname]['ansible_' + ans_network_interface ]['ipv4']['address'] }}:6385{% endif %} systemd.journald.forward_to_console=yes BOOTIF=${mac} nofb nomodeset vga=normal console=ttyS0 {{ inspector_extra_kernel_options | default('') }} initrd={{ ipa_ramdisk_url | basename }} initrd {{ ipa_ramdisk_url }} boot diff --git a/releasenotes/notes/fast-track-inspection-a28a062e86f06190.yaml b/releasenotes/notes/fast-track-inspection-a28a062e86f06190.yaml new file mode 100644 index 000000000..0f3e0521c --- /dev/null +++ b/releasenotes/notes/fast-track-inspection-a28a062e86f06190.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes fast-track deployment after inspection/discovery by providing the + correct ironic API URL to the ramdisk.