Merge pull request #425 from stackhpc/upstream/2025.1-2025-05-27

Synchronise 2025.1 with upstream

Author: priteau

ansible/kayobe-target-venv.yml

@@ -85,7 +85,7 @@
       vars:
         # Use the system python interpreter since the virtualenv might not
         # exist.
-        ansible_python_interpreter: /usr/bin/python3
+        ansible_python_interpreter: "{{ ansible_facts.python.executable }}"
       when: virtualenv is defined
 
     # If we gathered facts earlier it would have been with a different Python

ansible/roles/kolla-ansible/templates/kolla/globals.yml

@@ -505,6 +505,14 @@ ironic_inspector_kernel_cmdline_extras:
 grafana_admin_username: "{{ grafana_local_admin_user_name }}"
 {% endif %}
 
+###########################
+# Target python environment
+###########################
+{% if kolla_ansible_target_venv is not none %}
+# Execute ansible modules on the remote target hosts using a virtualenv.
+virtualenv: "{{ kolla_ansible_target_venv }}"
+{% endif %}
+
 {% if kolla_extra_globals %}
 #######################
 # Extra configuration

ansible/roles/kolla-ansible/templates/overcloud-components.j2

@@ -11,6 +11,7 @@ network
 compute
 storage
 monitoring
+bifrost
 
 [tls-backend:children]
 control

ansible/roles/kolla-ansible/templates/overcloud-top-level.j2

@@ -23,11 +23,6 @@ ansible_user={{ kolla_ansible_user }}
 {% if kolla_ansible_become | bool %}
 ansible_become=true
 {% endif %}
-{% if kolla_ansible_target_venv is not none %}
-# Execute ansible modules on the remote target hosts using a virtualenv.
-ansible_python_interpreter={{ kolla_ansible_target_venv }}/bin/python
-{% endif %}
-
 
 {% for kolla_group, kolla_group_config in kolla_overcloud_inventory_top_level_group_map.items() %}
 {% if 'groups' in kolla_group_config %}

ansible/roles/kolla-ansible/templates/seed.j2

@@ -8,7 +8,7 @@
 ansible_user={{ kolla_ansible_user }}
 {% if kolla_ansible_target_venv is not none %}
 # Execute ansible modules on the remote target hosts using a virtualenv.
-ansible_python_interpreter={{ kolla_ansible_target_venv }}/bin/python
+virtualenv={{ kolla_ansible_target_venv }}
 {% endif %}
 
 [baremetal:children]

releasenotes/notes/bug-2111594-656e035ece40fbf6.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fixes incorrect handling of ``ansible_python_interpreter`` when using
+    ``ansible-collection-kolla``. Kayobe now aligns its behavior with
+    ``kolla-ansible`` to ensure the correct interpreter is used.
+    `LP#2111594 <https://bugs.launchpad.net/kayobe/+bug/2111594>`__