used default omit

Signed-off-by: Abhash Solanki <[email protected]>
opiproject · Jul 12, 2024 · 1466b36 · 1466b36
1 parent 61dbf13
commit 1466b36
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 128 deletions.
diff --git a/.github/workflows/ansible.yml b/.github/workflows/ansible.yml
@@ -80,13 +80,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12"]
         ansible-version: [stable-2.17, stable-2.15, stable-2.16]
-        exclude:
-        # Ansible-core 2.16 is supported only from Python 3.10 onwards
-        - python-version: "3.9"
-          ansible-version: stable-2.16
-
     steps:
       - name: Perform sanity testing
         uses: ansible-community/ansible-test-gh-action@release/v1

diff --git a/roles/bmc_fw_update/tasks/main.yml b/roles/bmc_fw_update/tasks/main.yml
@@ -23,11 +23,11 @@
 
 - name: Store current fw version
   ansible.builtin.set_fact:
-    bmc_fw_update_cur_fw_version: "{{ vars.get_bmc_facts_all_fw_versions[bmc_fw_update_inventory_name] }}"
+    bmc_fw_update_cur_fw_version: "{{ get_bmc_facts_before.get_bmc_facts_all_fw_versions[bmc_fw_update_inventory_name] }}"
 
 - name: Print BMC Version
   ansible.builtin.debug:
-    msg: "{{ get_bmc_facts_all_fw_versions }}"
+    msg: "{{ get_bmc_facts_before.get_bmc_facts_all_fw_versions }}"
 
 - name: Check if firmware image exists locally {{ bmc_fw_update_image_file }}
   ansible.builtin.stat:
@@ -43,119 +43,62 @@
   delegate_to: "{{ bmc_fw_update_delegate }}"
   when: not bmc_fw_update_local_file_check.stat.exists
 
-# Check multipart support with user/pass authentication
-- block:
-    - name: Check multipart support using user/pass
-      ansible.builtin.uri:
-        url: "https://{{ inventory_hostname }}/redfish/v1/UpdateService"
-        method: GET
-        return_content: true
-        status_code: 200
-        body_format: json
-        url_username: "{{ dpu_bmc_username }}"
-        url_password: "{{ dpu_bmc_password }}"
-        force_basic_auth: true
-        validate_certs: false
-      delegate_to: "{{ bmc_fw_update_delegate }}"
-      register: bmc_fw_update_multipart_check
-
-    # Deprecated method with user/pass
-    - name: Update BMC firmware of DPU using deprecated HttpPushUri with user/pass
-      when: bmc_fw_update_multipart_check.json.MultipartHttpPushUri is not defined
-      ansible.builtin.uri:
-        url: "https://{{ inventory_hostname }}{{ bmc_fw_update_multipart_check.json.HttpPushUri }}"
-        method: POST
-        status_code: [200, 202]
-        src: "{{ bmc_fw_update_image_file }}"
-        headers:
-          Content-Type: application/octet-stream
-        url_username: "{{ dpu_bmc_username }}"
-        url_password: "{{ dpu_bmc_password }}"
-        force_basic_auth: true
-        validate_certs: false
-      delegate_to: "{{ bmc_fw_update_delegate }}"
-      register: bmc_fw_update_depecated_http_push
-
-    - name: Extract task id from update task with user/pass
-      when: bmc_fw_update_multipart_check.json.MultipartHttpPushUri is not defined
-      ansible.builtin.set_fact:
-        bmc_firmware_update_taskid: '{{ bmc_fw_update_depecated_http_push.location | urlsplit("path") }}'
-
-    # Update BMC firmware with user/pass
-    - name: Update BMC firmware of DPU with user/pass
-      when: bmc_fw_update_multipart_check.json.MultipartHttpPushUri is defined
-      community.general.redfish_command:
-        category: Update
-        command: MultipartHTTPPushUpdate
-        baseuri: "{{ inventory_hostname }}"
-        username: "{{ dpu_bmc_username }}"
-        password: "{{ dpu_bmc_password }}"
-        timeout: 600
-        update_image_file: "{{ bmc_fw_update_image_file }}"
-      register: result_update_task
-      delegate_to: "{{ bmc_fw_update_delegate }}"
-
-    - name: Extract task id from update task with user/pass
-      when: bmc_fw_update_multipart_check.json.MultipartHttpPushUri is defined
-      ansible.builtin.set_fact:
-        bmc_firmware_update_taskid: "{{ result_update_task.return_values.update_status.handle }}"
-
-  when: dpu_bmc_username is defined and dpu_bmc_password is defined
-
-# Check multipart support with token authentication
-- block:
-    - name: Check multipart support using token
-      ansible.builtin.uri:
-        url: "https://{{ inventory_hostname }}/redfish/v1/UpdateService"
-        method: GET
-        return_content: true
-        status_code: 200
-        body_format: json
-        headers:
-          X-Auth-Token: "{{ dpu_bmc_token }}"
-        validate_certs: false
-      delegate_to: "{{ bmc_fw_update_delegate }}"
-      register: bmc_fw_update_multipart_check
-
-    # Deprecated method with token
-    - name: Update BMC firmware of DPU using deprecated HttpPushUri with token
-      when: bmc_fw_update_multipart_check.json.MultipartHttpPushUri is not defined
-      ansible.builtin.uri:
-        url: "https://{{ inventory_hostname }}{{ bmc_fw_update_multipart_check.json.HttpPushUri }}"
-        method: POST
-        status_code: [200, 202]
-        src: "{{ bmc_fw_update_image_file }}"
-        headers:
-          Content-Type: application/octet-stream
-          X-Auth-Token: "{{ dpu_bmc_token }}"
-        validate_certs: false
-      delegate_to: "{{ bmc_fw_update_delegate }}"
-      register: bmc_fw_update_depecated_http_push
-
-    - name: Extract task id from update task with token
-      when: bmc_fw_update_multipart_check.json.MultipartHttpPushUri is not defined
-      ansible.builtin.set_fact:
-        bmc_firmware_update_taskid: '{{ bmc_fw_update_depecated_http_push.location | urlsplit("path") }}'
-
-    # Update BMC firmware with token
-    - name: Update BMC firmware of DPU with token
-      when: bmc_fw_update_multipart_check.json.MultipartHttpPushUri is defined
-      community.general.redfish_command:
-        category: Update
-        command: MultipartHTTPPushUpdate
-        baseuri: "{{ inventory_hostname }}"
-        auth_token: "{{ dpu_bmc_token }}"
-        timeout: 600
-        update_image_file: "{{ bmc_fw_update_image_file }}"
-      register: result_update_task
-      delegate_to: "{{ bmc_fw_update_delegate }}"
-
-    - name: Extract task id from update task with token
-      when: bmc_fw_update_multipart_check.json.MultipartHttpPushUri is defined
-      ansible.builtin.set_fact:
-        bmc_firmware_update_taskid: "{{ result_update_task.return_values.update_status.handle }}"
-
-  when: dpu_bmc_token is defined
+- name: Check multipart support
+  ansible.builtin.uri:
+    url: "https://{{ inventory_hostname }}/redfish/v1/UpdateService"
+    method: GET
+    return_content: true
+    status_code: 200
+    body_format: json
+    url_username: "{{ dpu_bmc_username | default(omit) }}"
+    url_password: "{{ dpu_bmc_password | default(omit) }}"
+    headers:
+      X-Auth-Token: "{{ dpu_bmc_token | default(omit) }}"
+    force_basic_auth: true
+    validate_certs: false
+  delegate_to: "{{ bmc_fw_update_delegate }}"
+  register: bmc_fw_update_multipart_check
+
+- name: Update BMC firmware of DPU using deprecated HttpPushUri
+  ansible.builtin.uri:
+    url: "https://{{ inventory_hostname }}{{ bmc_fw_update_multipart_check.json.HttpPushUri }}"
+    method: POST
+    status_code: [200, 202]
+    src: "{{ bmc_fw_update_image_file }}"
+    headers:
+      Content-Type: application/octet-stream
+      X-Auth-Token: "{{ dpu_bmc_token | default(omit) }}"
+    url_username: "{{ dpu_bmc_username | default(omit) }}"
+    url_password: "{{ dpu_bmc_password | default(omit) }}"
+    force_basic_auth: true
+    validate_certs: false
+  delegate_to: "{{ bmc_fw_update_delegate }}"
+  register: bmc_fw_update_deprecated_http_push
+  when: bmc_fw_update_multipart_check.json.MultipartHttpPushUri is not defined
+
+- name: Extract task id from update task
+  ansible.builtin.set_fact:
+    bmc_firmware_update_taskid: '{{ bmc_fw_update_deprecated_http_push.location | urlsplit("path") }}'
+  when: bmc_fw_update_multipart_check.json.MultipartHttpPushUri is not defined
+
+- name: Update BMC firmware of DPU
+  community.general.redfish_command:
+    category: Update
+    command: MultipartHTTPPushUpdate
+    baseuri: "{{ inventory_hostname }}"
+    auth_token: "{{ dpu_bmc_token | default(omit) }}"
+    username: "{{ dpu_bmc_username | default(omit) }}"
+    password: "{{ dpu_bmc_password | default(omit) }}"
+    timeout: 600
+    update_image_file: "{{ bmc_fw_update_image_file }}"
+  register: result_update_task
+  delegate_to: "{{ bmc_fw_update_delegate }}"
+  when: bmc_fw_update_multipart_check.json.MultipartHttpPushUri is defined
+
+- name: Extract task id from update task
+  ansible.builtin.set_fact:
+    bmc_firmware_update_taskid: "{{ result_update_task.return_values.update_status.handle }}"
+  when: bmc_fw_update_multipart_check.json.MultipartHttpPushUri is defined
 
 - name: Print TASK id for tracking
   ansible.builtin.debug:
@@ -166,20 +109,20 @@
     seconds: 10
 
 - name: Get the status of an update operation in a loop
-  when: bmc_fw_update_job_wait is true
   community.general.redfish_info:
     category: Update
     command: GetUpdateStatus
     baseuri: "{{ inventory_hostname }}"
+    auth_token: "{{ dpu_bmc_token | default(omit) }}"
     username: "{{ dpu_bmc_username | default(omit) }}"
     password: "{{ dpu_bmc_password | default(omit) }}"
-    auth_token: "{{ dpu_bmc_token | default(omit) }}"
     update_handle: "{{ bmc_firmware_update_taskid }}"
   register: update_progress
   until: update_progress.redfish_facts.update_status.status != 'Running'
   retries: 60
   delay: 30
   delegate_to: "{{ bmc_fw_update_delegate }}"
+  when: bmc_fw_update_job_wait is true
 
 - name: Validate task was completed
   ansible.builtin.fail:
@@ -191,8 +134,7 @@
 - name: Reboot BMC to apply new firmware of DPU
   ansible.builtin.include_role:
     name: bmc_reboot
-  when:
-    - bmc_fw_update_reboot is true
+  when: bmc_fw_update_reboot is true
 
 - name: Get Firmware Inventory
   ansible.builtin.include_role:
@@ -201,16 +143,16 @@
 
 - name: Print BMC Version
   ansible.builtin.debug:
-    msg: "{{ get_bmc_facts_all_fw_versions }}"
+    msg: "{{ get_bmc_facts_after.get_bmc_facts_all_fw_versions }}"
 
 - name: Store fw version we installed
   ansible.builtin.set_fact:
-    bmc_fw_update_got_fw_version: "{{ vars.get_bmc_facts_all_fw_versions[bmc_fw_update_inventory_name] }}"
+    bmc_fw_update_got_fw_version: "{{ get_bmc_facts_after.get_bmc_facts_all_fw_versions[bmc_fw_update_inventory_name] }}"
 
 - name: Validate fw image matches given filename
   ansible.builtin.fail:
     msg: "{{ bmc_fw_update_version_failure }}"
   when:
     - bmc_fw_update_reboot is true
-    - not bmc_fw_update_image_file is search(bmc_fw_update_got_fw_version | regex_search('[0-9-.]+'))"
+    - not (bmc_fw_update_image_file is search(bmc_fw_update_got_fw_version | regex_search('[0-9-.]+')))