From 5ceb5160b983931352505d171de75a0700b6b4cb Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@protonmail.com>
Date: Fri, 11 Jun 2021 14:55:36 +0200
Subject: [PATCH] Clean up kernel params

1) To not duplicate ipa-insecure in [inspector]extra_kernel_params
2) Add missing ilo_kernel_params

Change-Id: I6f09efb2cfd8c370304bf1342984a8a07fc6d1fd
---
 playbooks/roles/bifrost-ironic-install/defaults/main.yml | 1 +
 .../bifrost-ironic-install/templates/ironic.conf.j2      | 3 ++-
 releasenotes/notes/kernel-params-b8f054bd75390baa.yaml   | 9 +++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/kernel-params-b8f054bd75390baa.yaml

diff --git a/playbooks/roles/bifrost-ironic-install/defaults/main.yml b/playbooks/roles/bifrost-ironic-install/defaults/main.yml
index 0650c5974..561f8d9fc 100644
--- a/playbooks/roles/bifrost-ironic-install/defaults/main.yml
+++ b/playbooks/roles/bifrost-ironic-install/defaults/main.yml
@@ -396,3 +396,4 @@ pxe_kernel_params: >-
   {% endif %}
   {{ extra_kernel_options | default('') }}
 redfish_kernel_params: "{{ pxe_kernel_params }}"
+ilo_kernel_params: "{{ pxe_kernel_params }}"
diff --git a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
index c91f49935..84725be0d 100644
--- a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
+++ b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2
@@ -115,6 +115,7 @@ allow_credentials = {{ enable_cors_credential_support | default('true') }}
 
 [ilo]
 use_web_server_for_images = true
+kernel_append_params = {{ ilo_kernel_params }}
 
 [redfish]
 use_swift = False
@@ -123,7 +124,7 @@ kernel_append_params = {{ redfish_kernel_params }}
 {% if enable_inspector | bool == true %}
 [inspector]
 power_off = {{ power_off_after_inspection }}
-extra_kernel_params = ipa-insecure=1 {{ inspector_extra_kernel_options | default('') }}
+extra_kernel_params = {{ inspector_extra_kernel_options | default('') }}
 {% if enable_keystone | bool %}
 auth_type = password
 auth_url = {{ ironic.service_catalog.auth_url }}
diff --git a/releasenotes/notes/kernel-params-b8f054bd75390baa.yaml b/releasenotes/notes/kernel-params-b8f054bd75390baa.yaml
new file mode 100644
index 000000000..1a4e25060
--- /dev/null
+++ b/releasenotes/notes/kernel-params-b8f054bd75390baa.yaml
@@ -0,0 +1,9 @@
+---
+features:
+  - |
+    Kernel parameters for the ``ilo-virtual-media`` boot interface can now
+    be set via the new ``ilo_kernel_params`` variable.
+fixes:
+  - |
+    Adds the require default kernel parameters for the ``ilo-virtual-media``
+    boot interface.