From 4297cc34e2a61f4dada52c450c1c4fcb876d7a62 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Fri, 3 Aug 2018 10:14:09 +0100 Subject: [PATCH] Added kolla_inspector_extra_kernel_options This allows you to append additional kernel parameters to the kernel used for inspection. Change-Id: Ibc851145a3ffdaaad526ef999c8f024bd222dd5b --- ansible/roles/ironic/defaults/main.yml | 1 + ansible/roles/ironic/templates/inspector.ipxe.j2 | 2 +- ansible/roles/ironic/templates/pxelinux.default.j2 | 2 +- doc/source/reference/ironic-guide.rst | 10 ++++++++++ etc/kolla/globals.yml | 3 +++ ...rameters-for-ironic-inspector-0b4ad3b4de47129b.yaml | 5 +++++ 6 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/feature-extra-kernel-parameters-for-ironic-inspector-0b4ad3b4de47129b.yaml diff --git a/ansible/roles/ironic/defaults/main.yml b/ansible/roles/ironic/defaults/main.yml index dc9aa80fda..c707027610 100644 --- a/ansible/roles/ironic/defaults/main.yml +++ b/ansible/roles/ironic/defaults/main.yml @@ -157,6 +157,7 @@ ironic_cleaning_network: ironic_console_serial_speed: "115200n8" ironic_ipxe_url: http://{{ api_interface_address }}:{{ ironic_ipxe_port }} ironic_enable_rolling_upgrade: "yes" +ironic_inspector_kernel_cmdline_extras: [] #################### ## Kolla diff --git a/ansible/roles/ironic/templates/inspector.ipxe.j2 b/ansible/roles/ironic/templates/inspector.ipxe.j2 index 25bfc6e64b..c38277e50c 100644 --- a/ansible/roles/ironic/templates/inspector.ipxe.j2 +++ b/ansible/roles/ironic/templates/inspector.ipxe.j2 @@ -5,6 +5,6 @@ dhcp || goto retry_dhcp :retry_boot imgfree -kernel --timeout 30000 {{ ironic_ipxe_url }}/ironic-agent.kernel ipa-inspection-callback-url=http://{{ kolla_internal_vip_address }}:{{ ironic_inspector_port }}/v1/continue systemd.journald.forward_to_console=yes BOOTIF=${mac} initrd=agent.ramdisk || goto retry_boot +kernel --timeout 30000 {{ ironic_ipxe_url }}/ironic-agent.kernel ipa-inspection-callback-url=http://{{ kolla_internal_vip_address }}:{{ ironic_inspector_port }}/v1/continue systemd.journald.forward_to_console=yes BOOTIF=${mac} initrd=agent.ramdisk {{ ironic_inspector_kernel_cmdline_extras | join(' ') }} || goto retry_boot initrd --timeout 30000 {{ ironic_ipxe_url }}/ironic-agent.initramfs || goto retry_boot boot diff --git a/ansible/roles/ironic/templates/pxelinux.default.j2 b/ansible/roles/ironic/templates/pxelinux.default.j2 index 5304611a3d..0bbadc4c0d 100644 --- a/ansible/roles/ironic/templates/pxelinux.default.j2 +++ b/ansible/roles/ironic/templates/pxelinux.default.j2 @@ -2,6 +2,6 @@ default introspect label introspect kernel ironic-agent.kernel -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 +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 {{ ironic_inspector_kernel_cmdline_extras | join(' ') }} ipappend 3 diff --git a/doc/source/reference/ironic-guide.rst b/doc/source/reference/ironic-guide.rst index 964d0f317e..b34987d0c9 100644 --- a/doc/source/reference/ironic-guide.rst +++ b/doc/source/reference/ironic-guide.rst @@ -66,6 +66,16 @@ be used: .. end +You may optionally pass extra kernel parameters to the inspection kernel using: + +.. code-block:: yaml + + ironic_inspector_kernel_cmdline_extras: ['ipa-lldp-timeout=90.0', 'ipa-collect-lldp=1'] + +.. end + +in ``/etc/kolla/globals.yml``. + Enable iPXE booting (optional) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index ada0415e37..3624a82fdd 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -431,6 +431,9 @@ ironic_dnsmasq_dhcp_range: # Rolling upgrade were enable by default #ironic_enable_rolling_upgrade: "yes" +# List of extra kernel parameters passed to the kernel used during inspection +#ironic_inspector_kernel_cmdline_extras: [] + ###################################### # Manila - Shared File Systems Options ###################################### diff --git a/releasenotes/notes/feature-extra-kernel-parameters-for-ironic-inspector-0b4ad3b4de47129b.yaml b/releasenotes/notes/feature-extra-kernel-parameters-for-ironic-inspector-0b4ad3b4de47129b.yaml new file mode 100644 index 0000000000..0937671767 --- /dev/null +++ b/releasenotes/notes/feature-extra-kernel-parameters-for-ironic-inspector-0b4ad3b4de47129b.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Added the ``ironic_inspector_kernel_cmdline_extras`` option to append + additional kernel parameters to the kernel used for inspection.