Bug 1829836: Remove the ansible_failed_task variable from all block/rescue instances.

images/metering-ansible-operator/roles/meteringconfig/tasks/configure_hive_tls.yml

@@ -4,7 +4,21 @@
 # Validate user-provided Hive TLS configuration when top-level spec.tls.enabled is set to false
 #
 - name: Validate the user-provided Hive TLS configuration
-  include_tasks: validate_hive_tls.yml
+  block:
+  - include_tasks: validate_hive_tls.yml
+  rescue:
+  - include_tasks: update_meteringconfig_status.yml
+    vars:
+      end_play_after_updating_status: true
+      current_conditions:
+        type: "Invalid"
+        status: "True"
+        message: |
+          "{{ ansible_failed_result.msg }}"
+        lastTransitionTime: "{{ now(utc=False).isoformat() + 'Z' }}"
+    when:
+    - ansible_failed_result is defined
+    - ansible_failed_result.msg | length > 0
   when: not meteringconfig_tls_enabled
 
 #

images/metering-ansible-operator/roles/meteringconfig/tasks/configure_presto_tls.yml

@@ -4,7 +4,21 @@
 # Validate user-provided Presto TLS configuration when top-level spec.tls.enabled is set to false
 #
 - name: Validate the user-provided Presto TLS configuration
-  include_tasks: validate_presto_tls.yml
+  block:
+  - include_tasks: validate_presto_tls.yml
+  rescue:
+  - include_tasks: update_meteringconfig_status.yml
+    vars:
+      end_play_after_updating_status: true
+      current_conditions:
+        type: "Invalid"
+        status: "True"
+        message: |
+          "{{ ansible_failed_result.msg }}"
+        lastTransitionTime: "{{ now(utc=False).isoformat() + 'Z' }}"
+    when:
+    - ansible_failed_result is defined
+    - ansible_failed_result.msg | length > 0
   when: not meteringconfig_tls_enabled
 
 #

images/metering-ansible-operator/roles/meteringconfig/tasks/configure_reporting_operator_tls.yml

@@ -86,7 +86,21 @@
 # Reporting Operator Openshift Auth-Proxy
 #
 - name: Validate the user-provided authProxy configuration
-  include_tasks: validate_reporting_operator_tls.yml
+  block:
+  - include_tasks: validate_reporting_operator_tls.yml
+  rescue:
+  - include_tasks: update_meteringconfig_status.yml
+    vars:
+      end_play_after_updating_status: true
+      current_conditions:
+        type: "Invalid"
+        status: "True"
+        message: |
+          "{{ ansible_failed_result.msg }}"
+        lastTransitionTime: "{{ now(utc=False).isoformat() + 'Z' }}"
+    when:
+    - ansible_failed_result is defined
+    - ansible_failed_result.msg | length > 0
   when: not meteringconfig_tls_enabled
 
 - name: Check for the existence of reporting-operator authProxy-related secret data

images/metering-ansible-operator/roles/meteringconfig/tasks/configure_storage.yml

@@ -57,10 +57,13 @@
         current_conditions:
           type: "Invalid"
           status: "True"
-          message: "The task \"{{ ansible_failed_task.name }}\" failed with the following message: {{ ansible_failed_result.msg }}"
+          message: |
+            "{{ ansible_failed_result.msg }}"
           lastTransitionTime: "{{ now(utc=False).isoformat() + 'Z' }}"
         end_play_after_updating_status: true
-      when: ansible_failed_result and (ansible_failed_result.msg | length > 0)
+      when:
+      - ansible_failed_result is defined
+      - ansible_failed_result.msg | length > 0
   vars:
     s3_credentials_secret_exists: "{{ operator_s3_credentials_secret.resources and operator_s3_credentials_secret.resources | length > 0 }}"
     s3_use_dualstack_endpoint: "{{ _ocp_enabled_use_ipv6_networking }}"
@@ -102,10 +105,13 @@
         current_conditions:
           type: "Invalid"
           status: "True"
-          message: "The task \"{{ ansible_failed_task.name }}\" failed with the following message: {{ ansible_failed_result.msg }}"
+          message: |
+            "{{ ansible_failed_result.msg }}"
           lastTransitionTime: "{{ now(utc=False).isoformat() + 'Z' }}"
         end_play_after_updating_status: true
-      when: ansible_failed_result and (ansible_failed_result.msg | length > 0)
+      when:
+      - ansible_failed_result is defined
+      - ansible_failed_result.msg | length > 0
   when: meteringconfig_storage_hive_storage_type == 's3Compatible'
 
 #
@@ -135,10 +141,13 @@
         current_conditions:
           type: "Invalid"
           status: "True"
-          message: "The task \"{{ ansible_failed_task.name }}\" failed with the following message: {{ ansible_failed_result.msg }}"
+          message: |
+            "{{ ansible_failed_result.msg }}"
           lastTransitionTime: "{{ now(utc=False).isoformat() + 'Z' }}"
         end_play_after_updating_status: true
-      when: ansible_failed_result and (ansible_failed_result.msg | length > 0)
+      when:
+      - ansible_failed_result is defined
+      - ansible_failed_result.msg | length > 0
   when: meteringconfig_storage_hive_storage_type == 'azure' and not meteringconfig_storage_azure_create_secret
 
 - name: Configure Azure Storage
@@ -161,10 +170,13 @@
         current_conditions:
           type: "Invalid"
           status: "True"
-          message: "The task \"{{ ansible_failed_task.name }}\" failed with the following message: {{ ansible_failed_result.msg }}"
+          message: |
+            "{{ ansible_failed_result.msg }}"
           lastTransitionTime: "{{ now(utc=False).isoformat() + 'Z' }}"
         end_play_after_updating_status: true
-      when: ansible_failed_result and (ansible_failed_result.msg | length > 0)
+      when:
+      - ansible_failed_result is defined
+      - ansible_failed_result.msg | length > 0
   when: meteringconfig_storage_hive_storage_type == 'azure' and meteringconfig_storage_azure_create_secret
 
 #
@@ -197,10 +209,13 @@
         current_conditions:
           type: "Invalid"
           status: "True"
-          message: "The task \"{{ ansible_failed_task.name }}\" failed with the following message: {{ ansible_failed_result.msg }}"
+          message: |
+            "{{ ansible_failed_result.msg }}"
           lastTransitionTime: "{{ now(utc=False).isoformat() + 'Z' }}"
         end_play_after_updating_status: true
-      when: ansible_failed_result and (ansible_failed_result.msg | length > 0)
+      when:
+      - ansible_failed_result is defined
+      - ansible_failed_result.msg | length > 0
   when: meteringconfig_storage_hive_storage_type == 'gcs'
 
 - include_tasks: update_meteringconfig_status.yml

images/metering-ansible-operator/roles/meteringconfig/tasks/configure_tls.yml

@@ -30,14 +30,16 @@
   rescue:
   - include_tasks: update_meteringconfig_status.yml
     vars:
-      end_play_after_updating_status: true
       current_conditions:
         type: "Invalid"
         status: "True"
         message: |
-          "Failed task name: {{ ansible_failed_task.name }}"
-          "Failed task message: {{ ansible_failed_result.msg }}"
+          "{{ ansible_failed_result.msg }}"
         lastTransitionTime: "{{ now(utc=False).isoformat() + 'Z' }}"
+      end_play_after_updating_status: true
+    when:
+    - ansible_failed_result is defined
+    - ansible_failed_result.msg | length > 0
   always:
   - name: Cleanup the temporary directory which held the certificates and keys
     file:

images/metering-ansible-operator/roles/meteringconfig/tasks/deploy_resources.yml

@@ -11,18 +11,20 @@
     no_log: "{{ not meteringconfig_log_helm_template }}"
     register: template_results
   rescue:
-    - include_tasks: update_meteringconfig_status.yml
-      vars:
-        failed_result: "{{ ansible_failed_result.results | first }}"
-        end_play_after_updating_status: true
-        current_conditions:
-          type: "Invalid"
-          status: "True"
-          message: |
-            "Failed command: {{ failed_result.cmd | replace('...', '') | to_nice_yaml(indent=8, width=1337) }} "
-            "Error message: {{ failed_result.stderr_lines | to_nice_yaml }}"
-          lastTransitionTime: "{{ now(utc=False).isoformat() + 'Z' }}"
-      when: ansible_failed_result and ansible_failed_result.results and (ansible_failed_result.results | length > 0)
+  - include_tasks: update_meteringconfig_status.yml
+    vars:
+      failed_result: "{{ ansible_failed_result.results | first }}"
+      end_play_after_updating_status: true
+      current_conditions:
+        type: "Invalid"
+        status: "True"
+        message: |-
+          "{{ failed_result.stderr | to_nice_yaml }}"
+        lastTransitionTime: "{{ now(utc=False).isoformat() + 'Z' }}"
+    when:
+    - ansible_failed_result is defined
+    - ansible_failed_result.results is defined
+    - ansible_failed_result.results | length > 0
 
 - name: Add prune label to resources
   vars:
@@ -62,19 +64,21 @@
       definition: "{{ updated_template_results | flatten }}"
       merge_type: ['merge', 'strategic-merge']
   rescue:
-      # Note for ansible_failed_return:
-      # there's no guarantee that more fields besides msg will be available
-      # as the return object varies depending on the type of error encountered
-    - include_tasks: update_meteringconfig_status.yml
-      vars:
-        end_play_after_updating_status: true
-        current_conditions:
-          type: "Invalid"
-          status: "True"
-          message: |
-            "{{ ansible_failed_result.msg }}"
-          lastTransitionTime: "{{ now(utc=False).isoformat() + 'Z' }}"
-      when: ansible_failed_result is defined and (ansible_failed_result.msg | length > 0)
+    # Note for ansible_failed_return:
+    # there's no guarantee that more fields besides msg will be available
+    # as the return object varies depending on the type of error encountered
+  - include_tasks: update_meteringconfig_status.yml
+    vars:
+      current_conditions:
+        type: "Invalid"
+        status: "True"
+        message: |
+          "{{ ansible_failed_result.msg }}"
+        lastTransitionTime: "{{ now(utc=False).isoformat() + 'Z' }}"
+      end_play_after_updating_status: true
+    when:
+    - ansible_failed_result is defined
+    - ansible_failed_result.msg | length > 0
   when: template_results.changed and resource is not none
 
 - name: Prune resources
@@ -87,13 +91,16 @@
       loop_var: resource
       label: "{{ resource.template_file }}"
   rescue:
-    - include_tasks: update_meteringconfig_status.yml
-      vars:
-        end_play_after_updating_status: true
-        current_conditions:
-          type: "Invalid"
-          status: "True"
-          message: |
-            "{{ ansible_failed_result }}"
-          lastTransitionTime: "{{ now(utc=False).isoformat() + 'Z' }}"
+  - include_tasks: update_meteringconfig_status.yml
+    vars:
+      current_conditions:
+        type: "Invalid"
+        status: "True"
+        message: |
+          "{{ ansible_failed_result.msg }}"
+        lastTransitionTime: "{{ now(utc=False).isoformat() + 'Z' }}"
+      end_play_after_updating_status: true
+    when:
+    - ansible_failed_result is defined
+    - ansible_failed_result.msg | length > 0
   when: not (resource.create | default(true))

images/metering-ansible-operator/roles/meteringconfig/tasks/validate.yml

@@ -39,14 +39,16 @@
   rescue:
   - include_tasks: update_meteringconfig_status.yml
     vars:
-      end_play_after_updating_status: true
       current_conditions:
         type: "Invalid"
         status: "True"
         message: |
-          "Failed task name: {{ ansible_failed_task.name }}"
-          "Failed task message: {{ ansible_failed_result.msg }}"
+          "{{ ansible_failed_result.msg }}"
         lastTransitionTime: "{{ now(utc=False).isoformat() + 'Z' }}"
+      end_play_after_updating_status: true
+    when:
+    - ansible_failed_result is defined
+    - ansible_failed_result.msg | length > 0
   when: meteringconfig_ocp_disabled
 
 #
@@ -71,14 +73,16 @@
   rescue:
   - include_tasks: update_meteringconfig_status.yml
     vars:
-      end_play_after_updating_status: true
       current_conditions:
         type: "Invalid"
         status: "True"
         message: |
-          "Failed task name: {{ ansible_failed_task.name }}"
-          "Failed task message: {{ ansible_failed_result.msg }}"
+          "{{ ansible_failed_result.msg }}"
         lastTransitionTime: "{{ now(utc=False).isoformat() + 'Z' }}"
+      end_play_after_updating_status: true
+    when:
+    - ansible_failed_result is defined
+    - ansible_failed_result.msg | length > 0
 
 - include_tasks: update_meteringconfig_status.yml
   vars:
@@ -104,4 +108,3 @@
       kind: MeteringConfig
       name: "{{ meta.name }}"
       namespace: "{{ meta.namespace }}"
-

images/metering-ansible-operator/roles/meteringconfig/tasks/validate_hive_storage.yml

@@ -36,14 +36,16 @@
   rescue:
   - include_tasks: update_meteringconfig_status.yml
     vars:
-      end_play_after_updating_status: true
       current_conditions:
         type: "Invalid"
         status: "True"
         message: |
-          "Failed task name: {{ ansible_failed_task.name }}"
-          "Failed task message: {{ ansible_failed_result.msg }}"
+          "{{ ansible_failed_result.msg }}"
         lastTransitionTime: "{{ now(utc=False).isoformat() + 'Z' }}"
+      end_play_after_updating_status: true
+    when:
+    - ansible_failed_result is defined
+    - ansible_failed_result.msg | length > 0
   when: hiveStorageType == 'gcs'
 
 #
@@ -66,14 +68,16 @@
   rescue:
   - include_tasks: update_meteringconfig_status.yml
     vars:
-      end_play_after_updating_status: true
       current_conditions:
         type: "Invalid"
         status: "True"
         message: |
-          "Failed task name: {{ ansible_failed_task.name }}"
-          "Failed task message: {{ ansible_failed_result.msg }}"
+          "{{ ansible_failed_result.msg }}"
         lastTransitionTime: "{{ now(utc=False).isoformat() + 'Z' }}"
+      end_play_after_updating_status: true
+    when:
+    - ansible_failed_result is defined
+    - ansible_failed_result.msg | length > 0
   when: hiveStorageType == 'azure' and not meteringconfig_storage_azure_create_secret
 
 #
@@ -109,12 +113,14 @@
   rescue:
   - include_tasks: update_meteringconfig_status.yml
     vars:
-      end_play_after_updating_status: true
       current_conditions:
         type: "Invalid"
         status: "True"
         message: |
-          "Failed task name: {{ ansible_failed_task.name }}"
-          "Failed task message: {{ ansible_failed_result.msg }}"
+          "{{ ansible_failed_result.msg }}"
         lastTransitionTime: "{{ now(utc=False).isoformat() + 'Z' }}"
+      end_play_after_updating_status: true
+    when:
+    - ansible_failed_result is defined
+    - ansible_failed_result.msg | length > 0
   when: hiveStorageType == 's3Compatible'