Synchronise 2025.1 with upstream

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: []

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

ansible/roles/kolla-ansible/vars/main.yml

@@ -234,7 +234,7 @@ kolla_feature_flags:
   - telegraf
   - trove
   - trove_singletenant
-  - venus
   - valkey
+  - venus
   - watcher
   - zun

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.

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:
 

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 <https://bugs.launchpad.net/kayobe/+bug/2162755>`__