From 99f6addaca960fa80efe0c14dc436bccbf5aa3a5 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Fri, 12 Mar 2021 21:41:49 +0100
Subject: [PATCH] Fix formatting of extra kernel options for Bifrost
Change-Id: I5aa1a32015bb0090689447f977d7840c9e5fefdd
Story: 2008714
Task: 42049
---
ansible/roles/kolla-bifrost/templates/bifrost.yml.j2 | 2 +-
...bifrost-ironic-extra-kernel-params-9ebdec1212ac9827.yaml | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 releasenotes/notes/fix-bifrost-ironic-extra-kernel-params-9ebdec1212ac9827.yaml
diff --git a/ansible/roles/kolla-bifrost/templates/bifrost.yml.j2 b/ansible/roles/kolla-bifrost/templates/bifrost.yml.j2
index 89d998db..306d253a 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 }}"
+extra_kernel_options: "{{ kolla_bifrost_extra_kernel_options | join(' ') }}"
{% endif %}
# IP address range for DHCP.
diff --git a/releasenotes/notes/fix-bifrost-ironic-extra-kernel-params-9ebdec1212ac9827.yaml b/releasenotes/notes/fix-bifrost-ironic-extra-kernel-params-9ebdec1212ac9827.yaml
new file mode 100644
index 00000000..c2f5b02c
--- /dev/null
+++ b/releasenotes/notes/fix-bifrost-ironic-extra-kernel-params-9ebdec1212ac9827.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+ - |
+ Fixes formatting of extra kernel options configured with
+ ``kolla_bifrost_extra_kernel_options`` when passed to Bifrost. See `story
+ 2008714 <https://storyboard.openstack.org/#!/story/2008714>`__ for details.
--
GitLab