From 1c8507113a08536ff68477438f0c80e1b957c03e Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Mon, 15 Mar 2021 14:29:07 +0100
Subject: [PATCH] Support extra kernel options specified as strings instead of
 lists

Change-Id: Ib8c71fb4d775f5a234a433bf61434e8e46faf047
---
 ansible/roles/kolla-bifrost/templates/bifrost.yml.j2          | 4 ++--
 .../notes/extra-kernel-options-strings-bec7d851e334fec5.yaml  | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/extra-kernel-options-strings-bec7d851e334fec5.yaml

diff --git a/ansible/roles/kolla-bifrost/templates/bifrost.yml.j2 b/ansible/roles/kolla-bifrost/templates/bifrost.yml.j2
index 306d253aa..f496766d7 100644
--- a/ansible/roles/kolla-bifrost/templates/bifrost.yml.j2
+++ b/ansible/roles/kolla-bifrost/templates/bifrost.yml.j2
@@ -5,7 +5,7 @@ enabled_hardware_types: "{{ kolla_bifrost_enabled_hardware_types | join(',') }}"
 {% if kolla_bifrost_extra_kernel_options %}
 # List of extra kernel parameters for Bifrost's Ironic PXE configuration.
 # Default is empty.
-extra_kernel_options: "{{ kolla_bifrost_extra_kernel_options | join(' ') }}"
+extra_kernel_options: "{{ kolla_bifrost_extra_kernel_options if kolla_bifrost_extra_kernel_options is string else kolla_bifrost_extra_kernel_options | join(' ') }}"
 {% endif %}
 
 # IP address range for DHCP.
@@ -40,7 +40,7 @@ inspector_port_addition: "{{ kolla_bifrost_inspector_port_addition }}"
 
 {% if kolla_bifrost_inspector_extra_kernel_options %}
 # Extra kernel parameters for the inspector default PXE configuration.
-inspector_extra_kernel_options: "{{ kolla_bifrost_inspector_extra_kernel_options | join(' ') }}"
+inspector_extra_kernel_options: "{{ kolla_bifrost_inspector_extra_kernel_options if kolla_bifrost_inspector_extra_kernel_options is string else kolla_bifrost_inspector_extra_kernel_options | join(' ') }}"
 {% endif %}
 
 # Whether to download Ironic Python Agent (IPA) images.
diff --git a/releasenotes/notes/extra-kernel-options-strings-bec7d851e334fec5.yaml b/releasenotes/notes/extra-kernel-options-strings-bec7d851e334fec5.yaml
new file mode 100644
index 000000000..657ed9be3
--- /dev/null
+++ b/releasenotes/notes/extra-kernel-options-strings-bec7d851e334fec5.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Supports extra kernel options specified as strings instead of lists.