From 4c1d0766a9c05749ba00c9be3637962f306356e0 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Tue, 4 Aug 2026 11:11:55 +0200 Subject: [PATCH 1/2] Fix Bifrost extra_kernel_params validation Ironic recently added parsing of extra_kernel_params options [1]. Kayobe was generating "ipa-inspection-benchmarks=" when extra-hardware was disabled, which failed to validate. Update ipa_kernel_options_default to avoid producing kernel parameters with no value. [1] https://review.opendev.org/c/openstack/ironic/+/992306 Closes-Bug: #2162755 Change-Id: I35827eeb132fc7cd75a85aa0b33367d0a56dd33f Signed-off-by: Pierre Riteau (cherry picked from commit 8aae85bb9016579f1240a056e6525ffdc5b19df1) --- ansible/inventory/group_vars/all/ipa | 4 ++-- doc/source/configuration/reference/ironic-python-agent.rst | 7 ++++--- releasenotes/notes/bug-2162755-9852bd6b0606d9d8.yaml | 6 ++++++ 3 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 releasenotes/notes/bug-2162755-9852bd6b0606d9d8.yaml diff --git a/ansible/inventory/group_vars/all/ipa b/ansible/inventory/group_vars/all/ipa index f499b4961..274ada09a 100644 --- a/ansible/inventory/group_vars/all/ipa +++ b/ansible/inventory/group_vars/all/ipa @@ -176,8 +176,8 @@ ipa_benchmarks: > # List of default kernel parameters for Ironic python agent. ipa_kernel_options_default: > {{ ['ipa-collect-lldp=' ~ ('1' if ipa_collect_lldp | bool else '0')] + - ['ipa-inspection-collectors=' ~ ipa_collectors | join(',')] + - ['ipa-inspection-benchmarks=' ~ ipa_benchmarks | join(',')] }} + (['ipa-inspection-collectors=' ~ ipa_collectors | join(',')] if ipa_collectors else []) + + (['ipa-inspection-benchmarks=' ~ ipa_benchmarks | join(',')] if ipa_benchmarks else []) }} # List of additional kernel parameters for Ironic python agent. ipa_kernel_options_extra: [] diff --git a/doc/source/configuration/reference/ironic-python-agent.rst b/doc/source/configuration/reference/ironic-python-agent.rst index 23f7f4f06..84590840a 100644 --- a/doc/source/configuration/reference/ironic-python-agent.rst +++ b/doc/source/configuration/reference/ironic-python-agent.rst @@ -318,9 +318,10 @@ inspection. ``ipa_benchmarks_default`` and ``ipa_benchmarks_extra``. ``ipa_kernel_options_default`` List of default kernel parameters for Ironic python agent. Default includes - ``ipa-collect-lldp``, ``ipa-inspection-collectors`` and - ``ipa-inspection-benchmarks``, with arguments taken from - ``ipa_collect_lldp``, ``ipa_collectors`` and ``ipa_benchmarks``. + ``ipa-collect-lldp``, ``ipa-inspection-collectors`` (if ``ipa_collectors`` + is not empty) and ``ipa-inspection-benchmarks`` (if ``ipa_benchmarks`` is + not empty), with arguments taken from ``ipa_collect_lldp``, + ``ipa_collectors`` and ``ipa_benchmarks``. ``ipa_kernel_options_extra`` List of additional kernel parameters for Ironic python agent. Default is none. diff --git a/releasenotes/notes/bug-2162755-9852bd6b0606d9d8.yaml b/releasenotes/notes/bug-2162755-9852bd6b0606d9d8.yaml new file mode 100644 index 000000000..19a316df3 --- /dev/null +++ b/releasenotes/notes/bug-2162755-9852bd6b0606d9d8.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes Bifrost deployment by ensuring that extra kernel parameters are + successfully parsed by Ironic. + `LP#2162755 `__ From 64a07f2d80264e3a1f3416e3cc81ddb8c0f83396 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Fri, 28 Aug 2026 15:47:59 +0200 Subject: [PATCH 2/2] Sync inventory and flags from kolla-ansible 2025.1 Change-Id: I9dc7f8392a7172ccfd1a90296a9b952a1fe67955 Signed-off-by: Pierre Riteau --- .../roles/kolla-ansible/templates/overcloud-components.j2 | 7 +++---- ansible/roles/kolla-ansible/vars/main.yml | 2 +- etc/kayobe/kolla.yml | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 b/ansible/roles/kolla-ansible/templates/overcloud-components.j2 index b8925316e..7bab953b0 100644 --- a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 +++ b/ansible/roles/kolla-ansible/templates/overcloud-components.j2 @@ -119,7 +119,6 @@ control [cyborg:children] control -compute [gnocchi:children] control @@ -154,9 +153,6 @@ control [redis:children] control -[valkey:children] -control - [blazar:children] control @@ -165,3 +161,6 @@ monitoring [letsencrypt:children] loadbalancer + +[valkey:children] +control diff --git a/ansible/roles/kolla-ansible/vars/main.yml b/ansible/roles/kolla-ansible/vars/main.yml index 176b80d5d..c3940d384 100644 --- a/ansible/roles/kolla-ansible/vars/main.yml +++ b/ansible/roles/kolla-ansible/vars/main.yml @@ -234,7 +234,7 @@ kolla_feature_flags: - telegraf - trove - trove_singletenant - - venus - valkey + - venus - watcher - zun diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 4fe4a4bee..e1f7bda0e 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -441,8 +441,8 @@ #kolla_enable_telegraf: #kolla_enable_trove: #kolla_enable_trove_singletenant: -#kolla_enable_venus: #kolla_enable_valkey: +#kolla_enable_venus: #kolla_enable_watcher: #kolla_enable_zun: