Merge "Replace local_action with delegate to localhost"

Author: Zuul

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/opensm.yml

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

ansible/overcloud-introspection-data-save.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-inventory-discover.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

ansible/overcloud-provision.yml

@@ -221,8 +221,8 @@
         - final_provision_state != 'active'
 
     - name: Wait for SSH access to the nodes
-      local_action:
-        module: wait_for
+      delegate_to: localhost
+      wait_for:
         host: "{{ ansible_host }}"
         port: 22
         state: started

ansible/roles/console-allocation/tasks/main.yml

@@ -35,8 +35,8 @@
     # NOTE(mgoddard): Use the Python interpreter used to run ansible-playbook,
     # since this has Python dependencies available to it (PyYAML).
     ansible_python_interpreter: "{{ ansible_playbook_python }}"
-  local_action:
-    module: console_allocation
+  delegate_to: localhost
+  console_allocation:
     allocation_file: "{{ console_allocation_filename }}"
     nodes: "{{ console_allocation_ironic_nodes }}"
     allocation_pool_start: "{{ console_allocation_pool_start }}"

ansible/roles/dell-switch/tasks/main.yml

@@ -1,23 +1,23 @@
 ---
 - name: Ensure DellOS6 switches are configured
-  local_action:
-    module: dellos6_config
+  delegate_to: localhost
+  dellemc.os6.os6:
     provider: "{{ dell_switch_provider }}"
     src: "{{ lookup('template', 'dellos6-config.j2') }}"
     save: "{{ dell_switch_save | bool }}"
   when: dell_switch_type == 'dellos6'
 
 - name: Ensure DellOS9 switches are configured
-  local_action:
-    module: dellos9_config
+  delegate_to: localhost
+  dellemc.os9.os9:
     provider: "{{ dell_switch_provider }}"
     src: "{{ lookup('template', 'dellos9-config.j2') }}"
     save: "{{ dell_switch_save | bool }}"
   when: dell_switch_type == 'dellos9'
 
 - name: Ensure DellOS10 switches are configured
-  local_action:
-    module: dellos10_config
+  delegate_to: localhost
+  dellemc.os10.os10:
     provider: "{{ dell_switch_provider }}"
     src: "{{ lookup('template', 'dellos10-config.j2') }}"
     save: "{{ dell_switch_save | bool }}"