Merge branch 'devel' into patch-8

CONVERSION_GUIDE.md

@@ -112,12 +112,13 @@ controller_configuration vars:
 - controller_projects
 - controller_inventories
 - controller_inventory_sources
-- controller_inventory_sources
 - controller_hosts
+- controller_groups
 - controller_bulk_hosts
 - controller_templates
 - controller_workflows
 - controller_schedules
+- controller_roles
 - controller_launch_jobs
 - controller_workflow_launch_jobs
 - aap_user_accounts <- controller_user_accounts
@@ -217,7 +218,7 @@ The dispatch role has changed to use the following order:
 - controller roles
 - eda roles
 
-These loop through all the applicable roles to create objects in the AAP. They will skip the role if the variable used in that role is not defined. you can tweak each services set of roles, or only run a single services roles by using the `aap_configuration_dispatcher_roles` variables. Refer to the [Dispatch role readme](roles/eda_controller_tokens/README.md) for more information.
+These loop through all the applicable roles to create objects in the AAP. They will skip the role if the variable used in that role is not defined. you can tweak each services set of roles, or only run a single services roles by using the `aap_configuration_dispatcher_roles` variables. Refer to the [Dispatch role readme](roles/dispatch/README.md) for more information.
 
 ## Roles moved
 

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

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

changelogs/fragments/controller_workflow_job_templates.yml

@@ -1,3 +1,4 @@
 ---
 bugfixes:
   - Correct README.md to indicate destroy_current_nodes is bool
+  - Update loop label to only show name of workflow job template instead of entire json object

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:

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:

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"