Merge branch 'devel' into fix-conversion-guide-vars

redhat-cop · Dec 16, 2024 · 3b1efcc · 3b1efcc
2 parents e8e9384 + 0d0c5df
commit 3b1efcc
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 2 deletions.
diff --git a/changelogs/fragments/controller_credential_types.yml b/changelogs/fragments/controller_credential_types.yml
@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - Update loop label to only show name of credential type instead of entire json object
diff --git a/changelogs/fragments/controller_job_templates.yml b/changelogs/fragments/controller_job_templates.yml
@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - Update loop label to only show name of job template instead of entire json object
diff --git a/changelogs/fragments/controller_workflow_job_templates.yml b/changelogs/fragments/controller_workflow_job_templates.yml
@@ -0,0 +1,3 @@
+---
+bugfixes:
+  - Update loop label to only show name of workflow job template instead of entire json object
diff --git a/roles/controller_credential_types/tasks/main.yml b/roles/controller_credential_types/tasks/main.yml
@@ -45,7 +45,7 @@
   loop: "{{ __credentialtypes_job_async.results }}"
   loop_control:
     loop_var: __credentialtypes_job_async_result_item
-    label: "{{ __operation.verb }} Controller Credential Type {{ __credentialtypes_job_async_result_item }} | Wait for finish the credential type {{ __operation.action }}"
+    label: "{{ __operation.verb }} Controller Credential Type {{ __credentialtypes_job_async_result_item.__controller_credential_type_item.name }} | Wait for finish the credential type {{ __operation.action }}"
   when: not ansible_check_mode and __credentialtypes_job_async_result_item.ansible_job_id is defined
   no_log: "{{ controller_configuration_credential_types_secure_logging }}"
   vars:

diff --git a/roles/controller_job_templates/tasks/main.yml b/roles/controller_job_templates/tasks/main.yml
@@ -93,7 +93,7 @@
   loop: "{{ __job_templates_job_async.results }}"
   loop_control:
     loop_var: __job_templates_job_async_result_item
-    label: "{{ __operation.verb }} Job Template {{ __job_templates_job_async_result_item }} | Wait for finish the Job Template {{ __operation.action }}"
+    label: "{{ __operation.verb }} Job Template {{ __job_templates_job_async_result_item.__controller_template_item.name }} | Wait for finish the Job Template {{ __operation.action }}"
   when: not ansible_check_mode and __job_templates_job_async_result_item.ansible_job_id is defined
   no_log: "{{ controller_configuration_job_templates_secure_logging }}"
   vars:

diff --git a/roles/controller_workflow_job_templates/tasks/main.yml b/roles/controller_workflow_job_templates/tasks/main.yml
@@ -81,6 +81,7 @@
   loop: "{{ controller_workflows | default(workflow_job_templates) }}"
   loop_control:
     loop_var: __workflow_loop_item
+    label: "Workflow {{ __workflow_loop_item.name }}"
   when:
     - __workflow_loop_item.simplified_workflow_nodes is defined
     - (__workflow_loop_item.state | default('present')) ==  "present"