Merge pull request #614 from stackhpc/upstream/2025.1-2026-08-25

Synchronise 2025.1 with upstream

Author: priteau

ansible/baremetal-compute-introspection-data-save.yml

@@ -44,14 +44,14 @@
         ansible_host: "{{ hostvars[controller_host].ansible_host | default(controller_host) }}"
 
     - name: Ensure introspection data output directory exists
-      local_action:
-        module: file
+      delegate_to: localhost
+      file:
         path: "{{ output_dir }}"
         state: directory
 
     - name: Ensure introspection data is saved locally
-      local_action:
-        module: copy
+      delegate_to: localhost
+      copy:
         content: "{{ introspection_data_map[output_format | lower] }}"
         dest: "{{ output_dir }}/{{ inventory_hostname }}.{{ output_format | lower }}"
       when: save_result.rc == 0

ansible/docker-registry.yml

@@ -12,5 +12,5 @@
     - docker-registry
   roles:
     - role: docker-registry
-      docker_registry_action: "{{ kayobe_action }}"
+      docker_registry_action: "{{ kayobe_action | default('deploy') }}"
       docker_registry_config_path: "{{ config_path }}/docker-registry"

ansible/drac-facts.yml

@@ -11,8 +11,8 @@
     - role: stackhpc.drac-facts
   tasks:
     - name: Gather facts via DRAC
-      local_action:
-        module: drac_facts
+      delegate_to: localhost
+      drac_facts:
         address: "{{ ipmi_address }}"
         username: "{{ ipmi_username }}"
         password: "{{ ipmi_password }}"
@@ -23,7 +23,7 @@
         var: result
 
     - name: Write facts to a file
-      local_action:
-        module: copy
+      delegate_to: localhost
+      copy:
         content: "{{ result }}"
         dest: "/tmp/drac-facts-{{ inventory_hostname }}.json"

ansible/dump-config.yml

@@ -20,27 +20,27 @@
     dump_hosts: all
   tasks:
     - name: Create configuration dump directory
-      local_action:
-        module: file
+      delegate_to: localhost
+      file:
         path: "{{ dump_path }}"
         state: directory
 
     - name: Write host config to file
-      local_action:
-        module: copy
+      delegate_to: localhost
+      copy:
         content: "{{ hostvars[inventory_hostname] | to_nice_yaml }}"
         dest: "{{ dump_path }}/{{ inventory_hostname }}.yml"
       when: dump_var_name is not defined
 
     - name: Write host variable to file
-      local_action:
-        module: copy
+      delegate_to: localhost
+      copy:
         content: "{{ hostvars[inventory_hostname][dump_var_name] | to_nice_yaml }}"
         dest: "{{ dump_path }}/{{ inventory_hostname }}.yml"
       when: dump_var_name is defined
 
 #    - name: Write merged config to file
-#      local_action:
-#        module: copy
+#      delegate_to: localhost
+#      copy:
 #        content: "{{ hostvars | merge_config | to_nice_yaml }}"
 #        dest: "{{ dump_path }}/merged.yml

ansible/idrac-bootstrap-one.yml

@@ -45,12 +45,10 @@
 - block:
     - name: Ensure DellOS6 switch interface is a member of the bootstrap VLAN
       dellos6_config:
-        provider: "{{ dell_switch_provider }}"
         lines:
           - "switchport access vlan {{ idrac_bootstrap_vlan }}"
         parents:
           - "interface {{ switch_interface_name }}"
-      delegate_to: localhost
       when: switch_type == 'dellos6'
 
     # The tasks in this block are delegated to the controller.
@@ -170,12 +168,10 @@
   always:
     - name: Ensure DellOS6 switch iDRAC interface is a member of the management VLAN
       dellos6_config:
-        provider: "{{ dell_switch_provider }}"
         lines:
           - "switchport access vlan {{ idrac_network_vlan }}"
         parents:
           - "interface {{ switch_interface_name }}"
-      delegate_to: localhost
       when: switch_type == 'dellos6'
 
   when: idrac_bootstrap_required

ansible/idrac-bootstrap.yml

@@ -116,7 +116,6 @@
     # interfaces to it.
     - role: dell-switch
       dell_switch_type: "{{ switch_type }}"
-      dell_switch_provider: "{{ switch_dellos_provider }}"
       dell_switch_config:
         - "vlan {{ idrac_bootstrap_vlan }}"
       dell_switch_interface_config: "{{ switch_interface_config_bootstrap }}"
@@ -147,7 +146,6 @@
       include_tasks: idrac-bootstrap-one.yml
       vars:
         dell_switch_type: "{{ switch_type }}"
-        dell_switch_provider: "{{ switch_dellos_provider }}"
         switch_interface_name: "{{ item.key }}"
         idrac_port_description: "{{ item.value.description }}"
         idrac_network_ip: "{{ idrac_network_ips[idrac_port_description] }}"
@@ -181,7 +179,6 @@
     # interfaces from it.
     - role: dell-switch
       dell_switch_type: "{{ switch_type }}"
-      dell_switch_provider: "{{ switch_dellos_provider }}"
       dell_switch_config:
         - "no vlan {{ idrac_bootstrap_vlan }}"
       dell_switch_interface_config: "{{ switch_interface_config_bootstrap }}"

ansible/inventory/group_vars/all/switches/dell

@@ -12,4 +12,4 @@
     - opensm
   roles:
     - role: opensm
-      opensm_action: "{{ kayobe_action }}"
+      opensm_action: "{{ kayobe_action | default('deploy') }}"

ansible/opensm.yml

@@ -38,14 +38,14 @@
       become: "{{ container_engine == 'podman' }}"
 
     - name: Ensure introspection data output directory exists
-      local_action:
-        module: file
+      delegate_to: localhost
+      file:
         path: "{{ output_dir }}"
         state: directory
 
     - name: Ensure introspection data is saved locally
-      local_action:
-        module: copy
+      delegate_to: localhost
+      copy:
         content: "{{ introspection_data_map[output_format | lower] }}"
         dest: "{{ output_dir }}/{{ inventory_hostname }}.{{ output_format | lower }}"
       when: save_result.rc == 0

ansible/overcloud-introspection-data-save.yml

@@ -23,8 +23,8 @@
         ironic_inventory: "{{ inventory_result.stdout | from_json }}"
 
     - name: Ensure Kayobe overcloud inventory exists
-      local_action:
-        module: copy
+      delegate_to: localhost
+      copy:
         content: |
           # Managed by Ansible - do not edit.
           # This is the Kayobe overcloud inventory, autogenerated from the seed