Skip to content

Commit

Permalink
Update inspection configuration to enable fast-track
Browse files Browse the repository at this point in the history
Add ipa-api-url to inspector.ipxe and extra params in ironic.conf.
Without it ironic will never learn that the ramdisk has been booted
for inspection, requiring a reboot despite fast-track enabled.

NOTE: we need to configure everything in two places because there are
two inspection paths: discovery-style (via inspector.ipxe) and managed
(the same way as cleaning and deployment work).
  • Loading branch information
dtantsur committed Jul 1, 2020
1 parent e1d3941 commit 3466f9a
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
4 changes: 4 additions & 0 deletions configure-ironic.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ fast_track = ${IRONIC_FAST_TRACK}
[inspector]
endpoint_override = http://${IRONIC_URL_HOST}:5050
# TODO(dtantsur): ipa-api-url should be populated by ironic itself, but it's
# not, so working around here.
# NOTE(dtantsur): keep inspection arguments synchronized with inspector.ipxe
extra_kernel_params = ipa-inspector-collectors=default,extra-hardware,logs ipa-inspection-dhcp-all-interfaces=1 ipa-collect-lldp=1 ipa-api-url=http://${IRONIC_URL_HOST}:6385
[service_catalog]
endpoint_override = http://${IRONIC_URL_HOST}:6385
Expand Down
5 changes: 3 additions & 2 deletions inspector.ipxe
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
:retry_boot
echo In inspector.ipxe
imgfree
# NOTE(dtantsur): keep inspection kernel params in [mdns]params in ironic-inspector-image
kernel --timeout 60000 http://IRONIC_IP:HTTP_PORT/images/ironic-python-agent.kernel ipa-inspection-callback-url=http://IRONIC_IP:5050/v1/continue ipa-inspection-collectors=default,extra-hardware,logs systemd.journald.forward_to_console=yes BOOTIF=${mac} ipa-debug=1 ipa-inspection-dhcp-all-interfaces=1 ipa-collect-lldp=1 initrd=ironic-python-agent.initramfs || goto retry_boot
# NOTE(dtantsur): keep inspection kernel params in [mdns]params in
# ironic-inspector-image and configuration in configure-ironic.sh
kernel --timeout 60000 http://IRONIC_IP:HTTP_PORT/images/ironic-python-agent.kernel ipa-inspection-callback-url=http://IRONIC_IP:5050/v1/continue ipa-api-url=http://IRONIC_IP:6385 ipa-inspection-collectors=default,extra-hardware,logs systemd.journald.forward_to_console=yes BOOTIF=${mac} ipa-debug=1 ipa-inspection-dhcp-all-interfaces=1 ipa-collect-lldp=1 initrd=ironic-python-agent.initramfs || goto retry_boot
initrd --timeout 60000 http://IRONIC_IP:HTTP_PORT/images/ironic-python-agent.initramfs || goto retry_boot
boot
3 changes: 3 additions & 0 deletions ironic.conf
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ http_root = /shared/html/
[dhcp]
dhcp_provider = none

[inspector]
power_off = false

[oslo_messaging_notifications]
driver = prometheus_exporter
location = /shared/ironic_prometheus_exporter
Expand Down

0 comments on commit 3466f9a

Please sign in to comment.