diff --git a/CONVERSION_GUIDE.md b/CONVERSION_GUIDE.md index b4f3ef40c..0b86bdbe5 100644 --- a/CONVERSION_GUIDE.md +++ b/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 diff --git a/changelogs/fragments/controller_credential_types.yml b/changelogs/fragments/controller_credential_types.yml new file mode 100644 index 000000000..ca6235926 --- /dev/null +++ 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 new file mode 100644 index 000000000..d4249842b --- /dev/null +++ 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 index 7fb8079c4..48797878a 100644 --- a/changelogs/fragments/controller_workflow_job_templates.yml +++ b/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 diff --git a/roles/controller_credential_types/tasks/main.yml b/roles/controller_credential_types/tasks/main.yml index d8c042ec0..e668e285d 100644 --- 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 index 3e2768017..61c41bae3 100644 --- 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 index 5c9e14569..1c90997d4 100644 --- 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"