Merge pull request #360 from stackhpc/upstream/2024.1-2025-01-13

Synchronise 2024.1 with upstream

Author: priteau

ansible/overcloud-deprovision.yml

@@ -37,7 +37,7 @@
     - name: confirm_deprovision
       prompt: |
         The following hosts will be deprovisioned:
-        {{ play_hosts | join(', ') }}
+        {{ play_hosts | intersect(groups['overcloud'] | default([])) | join(', ') }}
         If you want to proceed type: yes
       default: "no"
       private: false

ansible/roles/ipa-images/tasks/set-driver-info.yml

@@ -20,12 +20,19 @@
   set_fact:
     ipa_images_ramdisk_uuid: "{{ ipa_images_glance.results[1].images[0].id }}"
 
+- name: Change system scope to all for Ironic operations
+  set_fact:
+    ipa_images_ironic_openstack_auth_env: "{{ ipa_images_openstack_auth_env |
+    combine ({ 'OS_PROJECT_NAME': omit }) |
+    combine ({ 'OS_PROJECT_DOMAIN_NAME': omit }) |
+    combine ({ 'OS_SYSTEM_SCOPE': 'all' }) }}"
+
 - name: Get a list of ironic nodes
   command: |
     {{ ipa_images_venv }}/bin/openstack baremetal node list --fields name uuid driver_info -f json
   register: ipa_images_ironic_node_list
   changed_when: False
-  environment: "{{ ipa_images_openstack_auth_env }}"
+  environment: "{{ ipa_images_ironic_openstack_auth_env }}"
 
 - name: Make sure openstack nodes are in baremetal-compute group
   add_host:
@@ -59,4 +66,4 @@
   when:
     item["Driver Info"].deploy_kernel != ipa_images_kernel_uuid or
     item["Driver Info"].deploy_ramdisk != ipa_images_ramdisk_uuid
-  environment: "{{ ipa_images_openstack_auth_env }}"
+  environment: "{{ ipa_images_ironic_openstack_auth_env }}"

playbooks/kayobe-base/pre.yml

@@ -78,15 +78,17 @@
         kayobe_galaxy_requirements_src_dir: "{{ kolla_ansible_src_dir }}"
         kayobe_galaxy_requirements_dest_path: "/tmp/kolla-ansible-requirements.yml"
 
-    - block:
+    - vars:
+        branch_prefix: "{{ 'unmaintained' if previous_release | lower == '2023.1' else 'stable' }}"
+      block:
         - name: Ensure previous kayobe directory exists
           file:
             path: "{{ previous_kayobe_src_dir }}"
             state: directory
 
         - name: Ensure previous kayobe repository is cloned
           command: >-
-            git clone {{ kayobe_src_dir }} {{ previous_kayobe_src_dir }} -b stable/{{ previous_release | lower }}
+            git clone {{ kayobe_src_dir }} {{ previous_kayobe_src_dir }} -b {{ branch_prefix }}/{{ previous_release | lower }}
 
         - name: Ensure previous kayobe-config directory exists
           file:
@@ -95,7 +97,7 @@
 
         - name: Ensure kayobe-config repository is cloned
           command: >-
-            git clone {{ kayobe_config_src_dir }} {{ previous_kayobe_config_src_dir }} -b stable/{{ previous_release | lower }}
+            git clone {{ kayobe_config_src_dir }} {{ previous_kayobe_config_src_dir }} -b {{ branch_prefix }}/{{ previous_release | lower }}
 
         - name: Ensure previous kolla-ansible directory exists
           file:
@@ -104,7 +106,7 @@
 
         - name: Ensure previous kolla-ansible repository is cloned
           command: >-
-            git clone {{ kolla_ansible_src_dir }} {{ previous_kolla_ansible_src_dir }} -b stable/{{ previous_release | lower }}
+            git clone {{ kolla_ansible_src_dir }} {{ previous_kolla_ansible_src_dir }} -b {{ branch_prefix }}/{{ previous_release | lower }}
 
         - name: Ensure previous kayobe is executed in verbose mode
           lineinfile:
@@ -117,14 +119,14 @@
             name: kayobe-galaxy-requirements
           vars:
             kayobe_galaxy_requirements_src_dir: "{{ previous_kayobe_src_dir }}"
-            kayobe_galaxy_requirements_branch: "stable/{{ previous_release | lower }}"
+            kayobe_galaxy_requirements_branch: "{{ branch_prefix }}/{{ previous_release | lower }}"
 
         - name: Update kolla-ansible requirements.yml
           include_role:
             name: kayobe-galaxy-requirements
           vars:
             kayobe_galaxy_requirements_src_dir: "{{ previous_kolla_ansible_src_dir }}"
-            kayobe_galaxy_requirements_branch: "stable/{{ previous_release | lower }}"
+            kayobe_galaxy_requirements_branch: "{{ branch_prefix }}/{{ previous_release | lower }}"
             kayobe_galaxy_requirements_dest_path: "/tmp/previous-kolla-ansible-requirements.yml"
 
       when: is_upgrade

releasenotes/notes/bug-2083014-set-driver-info-86ff04d3d32cdb8c.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fixes an issue where task 'ensure ironic nodes use the new Ironic
+    Python Agent (IPA) images` fails with 'dict object' has no
+    attribute 'deploy_kernel'.
+    <https://bugs.launchpad.net/kayobe/+bug/2083014>`__.

releasenotes/notes/fix-overcloud-deprovision-prompt-host-lists-cfb701162c114c60.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes a bug where non-overcloud hosts would show up in the confirmation
+    prompt for `kayobe overcloud deprovision`
+    `LP#2091703 <https://bugs.launchpad.net/kayobe/+bug/2091621>`__