diff --git a/.github/workflows/ci_standalone.yml b/.github/disabled_workflows/ci_standalone.yml similarity index 100% rename from .github/workflows/ci_standalone.yml rename to .github/disabled_workflows/ci_standalone.yml diff --git a/.github/workflows/ci_standalone_versioned.yml b/.github/disabled_workflows/ci_standalone_versioned.yml similarity index 100% rename from .github/workflows/ci_standalone_versioned.yml rename to .github/disabled_workflows/ci_standalone_versioned.yml diff --git a/roles/controller_workflow_job_templates/README.md b/roles/controller_workflow_job_templates/README.md index 94f8f1eb9..a9735bbe3 100644 --- a/roles/controller_workflow_job_templates/README.md +++ b/roles/controller_workflow_job_templates/README.md @@ -67,7 +67,7 @@ This also speeds up the overall role. |`aap_configuration_async_delay`|1|no|This sets the delay between retries for the role globally.| |`controller_configuration_workflow_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| |`aap_configuration_loop_delay`|0|no|This sets the pause between each item in the loop for the roles globally. To help when API is getting overloaded.| -|`controller_configuration_workflow__loop_delay`|`aap_configuration_loop_delay`|no|This sets the pause between each item in the loop for the role. To help when API is getting overloaded.| +|`controller_configuration_workflow_loop_delay`|`aap_configuration_loop_delay`|no|This sets the pause between each item in the loop for the role. To help when API is getting overloaded.| |`aap_configuration_async_dir`|`null`|no|Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`.| ## Data Structure diff --git a/roles/controller_workflow_job_templates/defaults/main.yml b/roles/controller_workflow_job_templates/defaults/main.yml index 4d308e44a..a75c8eb8f 100644 --- a/roles/controller_workflow_job_templates/defaults/main.yml +++ b/roles/controller_workflow_job_templates/defaults/main.yml @@ -4,7 +4,7 @@ controller_workflows: [] workflow_job_templates_secure_logging: "{{ aap_configuration_secure_logging | default('false') }}" controller_configuration_workflow_async_retries: "{{ aap_configuration_async_retries | default(30) }}" controller_configuration_workflow_async_delay: "{{ aap_configuration_async_delay | default(1) }}" -controller_configuration_workflow__loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" +controller_configuration_workflow_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" aap_configuration_async_dir: null controller_configuration_workflows_enforce_defaults: "{{ aap_configuration_enforce_defaults | default(false) }}" ... diff --git a/roles/controller_workflow_job_templates/tasks/add_workflows_schema.yml b/roles/controller_workflow_job_templates/tasks/add_workflows_schema.yml index b26c76904..bc9522737 100644 --- a/roles/controller_workflow_job_templates/tasks/add_workflows_schema.yml +++ b/roles/controller_workflow_job_templates/tasks/add_workflows_schema.yml @@ -39,7 +39,7 @@ loop_control: loop_var: __workflow_loop_node_item label: "{{ __workflow_loop_item.name }}/{{ __workflow_loop_node_item.identifier }}" - pause: "{{ controller_configuration_workflow__loop_delay }}" + pause: "{{ controller_configuration_workflow_loop_delay }}" no_log: "{{ workflow_job_templates_secure_logging }}" async: "{{ ansible_check_mode | ternary(0, 1000) }}" poll: 0 diff --git a/roles/dispatch/defaults/main.yml b/roles/dispatch/defaults/main.yml index b24997269..f39795a26 100644 --- a/roles/dispatch/defaults/main.yml +++ b/roles/dispatch/defaults/main.yml @@ -39,6 +39,10 @@ gateway_configuration_dispatcher_roles: - role: gateway_teams var: aap_teams tags: teams + - role: gateway_users + var: aap_user_accounts + tags: teams + ah_configuration_dispatcher_roles: - role: hub_namespace var: ah_namespaces diff --git a/roles/gateway_applications/tasks/main.yml b/roles/gateway_applications/tasks/main.yml index a77c98158..495e178e7 100644 --- a/roles/gateway_applications/tasks/main.yml +++ b/roles/gateway_applications/tasks/main.yml @@ -35,7 +35,7 @@ changed_when: not __gateway_applications_job_async.changed vars: __operation: "{{ operation_translate[__gateway_application_item.state | default(platform_state) | default('present')] }}" - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" - name: Applications | Wait for finish the configuration ansible.builtin.async_status: @@ -52,5 +52,5 @@ no_log: "{{ applications_secure_logging }}" vars: __operation: "{{ operation_translate[__gateway_applications_job_async_results_item.state | default(platform_state) | default('present')] }}" - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" ... diff --git a/roles/gateway_authenticator_maps/tasks/main.yml b/roles/gateway_authenticator_maps/tasks/main.yml index 50d882352..583b3e461 100644 --- a/roles/gateway_authenticator_maps/tasks/main.yml +++ b/roles/gateway_authenticator_maps/tasks/main.yml @@ -33,7 +33,7 @@ changed_when: not __gateway_authenticator_maps_job_async.changed vars: __operation: "{{ operation_translate[__gateway_authenticator_maps_item.state | default(platform_state) | default('present')] }}" - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" - name: Authenticator Map | Wait for finish the configuration ansible.builtin.async_status: @@ -50,5 +50,5 @@ no_log: "{{ gateway_authenticator_maps_secure_logging }}" vars: __operation: "{{ operation_translate[__gateway_authenticator_maps_job_async_results_item.state | default(platform_state) | default('present')] }}" - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" ... diff --git a/roles/gateway_authenticators/tasks/main.yml b/roles/gateway_authenticators/tasks/main.yml index f8f334212..f0288beb7 100644 --- a/roles/gateway_authenticators/tasks/main.yml +++ b/roles/gateway_authenticators/tasks/main.yml @@ -31,7 +31,7 @@ changed_when: not __gateway_authenticators_job_async.changed vars: __operation: "{{ operation_translate[__gateway_authenticators_item.state | default(platform_state) | default('present')] }}" - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" - name: Authenticators | Wait for finish the configuration ansible.builtin.async_status: @@ -48,5 +48,5 @@ no_log: "{{gateway_authenticators_secure_logging }}" vars: __operation: "{{ operation_translate[__gateway_authenticators_job_async_results_item.state | default(platform_state) | default('present')] }}" - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" ... diff --git a/roles/gateway_http_ports/tasks/main.yml b/roles/gateway_http_ports/tasks/main.yml index dd089b1f2..f6682a136 100644 --- a/roles/gateway_http_ports/tasks/main.yml +++ b/roles/gateway_http_ports/tasks/main.yml @@ -27,7 +27,7 @@ changed_when: not __gateway_http_ports_job_async.changed vars: __operation: "{{ operation_translate[__gateway_http_ports_item.state | default(platform_state) | default('present')] }}" - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" - name: Http Ports | Wait for finish the configuration ansible.builtin.async_status: @@ -44,5 +44,5 @@ no_log: "{{ gateway_http_ports_secure_logging }}" vars: __operation: "{{ operation_translate[__gateway_http_ports_job_async_results_item.state | default(platform_state) | default('present')] }}" - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" ... diff --git a/roles/gateway_organizations/tasks/main.yml b/roles/gateway_organizations/tasks/main.yml index 36c1cdf63..7a5190eb1 100644 --- a/roles/gateway_organizations/tasks/main.yml +++ b/roles/gateway_organizations/tasks/main.yml @@ -25,7 +25,7 @@ changed_when: not __gateway_organizations_job_async.changed vars: __operation: "{{ operation_translate[__gateway_organizations_item.state | default(platform_state) | default('present')] }}" - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" - name: Organizations | Wait for finish the configuration ansible.builtin.async_status: @@ -42,5 +42,5 @@ no_log: "{{ gateway_organizations_secure_logging }}" vars: __operation: "{{ operation_translate[__gateway_organizations_job_async_results_item.state | default(platform_state) | default('present')] }}" - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" ... diff --git a/roles/gateway_role_user_assignments/tasks/main.yml b/roles/gateway_role_user_assignments/tasks/main.yml index 466423758..878ac2dd3 100644 --- a/roles/gateway_role_user_assignments/tasks/main.yml +++ b/roles/gateway_role_user_assignments/tasks/main.yml @@ -24,7 +24,7 @@ register: __gateway_role_user_assignments_job_async changed_when: not __gateway_role_user_assignments_job_async.changed vars: - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" - name: Role User Assignments | Wait for finish the configuration ansible.builtin.async_status: @@ -39,5 +39,5 @@ when: __gateway_role_user_assignments_job_async_results_item.ansible_job_id is defined no_log: "{{ role_user_assignments_secure_logging }}" vars: - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" ... diff --git a/roles/gateway_routes/tasks/main.yml b/roles/gateway_routes/tasks/main.yml index 30d249def..a4cfd5a27 100644 --- a/roles/gateway_routes/tasks/main.yml +++ b/roles/gateway_routes/tasks/main.yml @@ -33,7 +33,7 @@ changed_when: not __gateway_routes_job_async.changed vars: __operation: "{{ operation_translate[__gateway_routes_item.state | default(platform_state) | default('present')] }}" - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" - name: Routes | Wait for finish the configuration ansible.builtin.async_status: @@ -50,5 +50,5 @@ no_log: "{{ gateway_routes_secure_logging }}" vars: __operation: "{{ operation_translate[__gateway_routes_job_async_results_item.state | default(platform_state) | default('present')] }}" - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" ... diff --git a/roles/gateway_service_clusters/tasks/main.yml b/roles/gateway_service_clusters/tasks/main.yml index dc158d5d5..2e9e8e192 100644 --- a/roles/gateway_service_clusters/tasks/main.yml +++ b/roles/gateway_service_clusters/tasks/main.yml @@ -35,7 +35,7 @@ changed_when: not __gateway_service_clusters_job_async.changed vars: __operation: "{{ operation_translate[__gateway_service_clusters_item.state | default(platform_state) | default('present')] }}" - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" - name: Service Clusters | Wait for finish the configuration ansible.builtin.async_status: @@ -52,5 +52,5 @@ no_log: "{{ gateway_service_clusters_secure_logging }}" vars: __operation: "{{ operation_translate[__gateway_service_clusters_job_async_results_item.state | default(platform_state) | default('present')] }}" - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" ... diff --git a/roles/gateway_service_keys/tasks/main.yml b/roles/gateway_service_keys/tasks/main.yml index 81a22049e..db348a85f 100644 --- a/roles/gateway_service_keys/tasks/main.yml +++ b/roles/gateway_service_keys/tasks/main.yml @@ -30,7 +30,7 @@ changed_when: not __gateway_service_keys_job_async.changed vars: __operation: "{{ operation_translate[__gateway_service_keys_item.state | default(platform_state) | default('present')] }}" - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" - name: Service Keys | Wait for finish the configuration ansible.builtin.async_status: @@ -47,5 +47,5 @@ no_log: "{{ gateway_gateway_service_keys_secure_logging }}" vars: __operation: "{{ operation_translate[__gateway_service_keys_job_async_results_item.state | default(platform_state) | default('present')] }}" - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" ... diff --git a/roles/gateway_service_nodes/tasks/main.yml b/roles/gateway_service_nodes/tasks/main.yml index f32ff6b20..8180bf7f6 100644 --- a/roles/gateway_service_nodes/tasks/main.yml +++ b/roles/gateway_service_nodes/tasks/main.yml @@ -27,7 +27,7 @@ changed_when: not __gateway_service_nodes_job_async.changed vars: __operation: "{{ operation_translate[__gateway_service_nodes_item.state | default(platform_state) | default('present')] }}" - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" - name: Service Nodes | Wait for finish the configuration ansible.builtin.async_status: @@ -44,5 +44,5 @@ no_log: "{{ service_nodes_secure_logging }}" vars: __operation: "{{ operation_translate[__gateway_service_nodes_job_async_results_item.state | default(platform_state) | default('present')] }}" - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" ... diff --git a/roles/gateway_services/tasks/main.yml b/roles/gateway_services/tasks/main.yml index b3823e149..5c94fd8dc 100644 --- a/roles/gateway_services/tasks/main.yml +++ b/roles/gateway_services/tasks/main.yml @@ -34,7 +34,7 @@ changed_when: not __gateway_services_job_async.changed vars: __operation: "{{ operation_translate[__gateway_services_item.state | default(platform_state) | default('present')] }}" - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" - name: Services | Wait for finish the configuration ansible.builtin.async_status: @@ -51,5 +51,5 @@ no_log: "{{ services_secure_logging }}" vars: __operation: "{{ operation_translate[__gateway_services_job_async_results_item.state | default(platform_state) | default('present')] }}" - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" ... diff --git a/roles/gateway_teams/tasks/main.yml b/roles/gateway_teams/tasks/main.yml index e5330ea3f..b26df44ae 100644 --- a/roles/gateway_teams/tasks/main.yml +++ b/roles/gateway_teams/tasks/main.yml @@ -27,7 +27,7 @@ changed_when: not __gateway_teams_job_async.changed vars: __operation: "{{ operation_translate[__gateway_teams_item.state | default(platform_state) | default('present')] }}" - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" - name: Teams | Wait for finish the configuration ansible.builtin.async_status: @@ -44,5 +44,5 @@ no_log: "{{ platform_teams_secure_logging }}" vars: __operation: "{{ operation_translate[__gateway_teams_job_async_results_item.state | default(platform_state) | default('present')] }}" - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" ... diff --git a/roles/gateway_users/tasks/main.yml b/roles/gateway_users/tasks/main.yml index 6243dffbe..e142fc122 100644 --- a/roles/gateway_users/tasks/main.yml +++ b/roles/gateway_users/tasks/main.yml @@ -26,29 +26,29 @@ loop_var: __gateway_user_accounts_item label: "{{ __operation.verb }} the Gateway user {{ __gateway_user_accounts_item.username }}" pause: "{{ gateway_users_loop_delay }}" - no_log: "{{ users_secure_logging }}" + no_log: "{{ gateway_users_secure_logging }}" async: 1000 poll: 0 register: __gateway_user_accounts_job_async changed_when: not __gateway_user_accounts_job_async.changed vars: __operation: "{{ operation_translate[__gateway_user_accounts_item.state | default(platform_state) | default('present')] }}" - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" - name: Users | Wait for finish the configuration ansible.builtin.async_status: jid: "{{ __gateway_user_accounts_job_async_results_item.ansible_job_id }}" register: __gateway_user_accounts_job_async_result until: __gateway_user_accounts_job_async_result.finished - retries: "{{ users_async_retries }}" - delay: "{{ users_async_delay }}" + retries: "{{ gateway_users_async_retries }}" + delay: "{{ gateway_users_async_delay }}" loop: "{{ __gateway_user_accounts_job_async.results }}" loop_control: loop_var: __gateway_user_accounts_job_async_results_item - label: "{{ __operation.verb }} Label {{ __gateway_user_accounts_job_async_result.__gateway_user_accounts_item.name }} | Wait for finish the Label {{ __operation.action }}" + label: "{{ __operation.verb }} Label {{ __gateway_user_accounts_job_async_result.__gateway_user_accounts_job_async_results_item.__gateway_user_accounts_item.username }} | Wait for finish the Label {{ __operation.action }}" when: __gateway_user_accounts_job_async_results_item.ansible_job_id is defined - no_log: "{{ users_secure_logging }}" + no_log: "{{ gateway_users_secure_logging }}" vars: __operation: "{{ operation_translate[__gateway_user_accounts_job_async_results_item.state | default(platform_state) | default('present')] }}" - ansible_async_dir: "{{ aap_configuration_async_dir | default(omit) }}" + ansible_async_dir: "{{ aap_configuration_async_dir }}" ... diff --git a/roles/hub_collection/tasks/main.yml b/roles/hub_collection/tasks/main.yml index 10f48e9aa..df2c2744a 100644 --- a/roles/hub_collection/tasks/main.yml +++ b/roles/hub_collection/tasks/main.yml @@ -38,7 +38,7 @@ loop_control: loop_var: __collections_item label: "{{ __operation.verb }} the collection {{ __ah_configuration_collection__item.name }} in Hub" - pause: "{{ ah_configuration_collection__loop_delay }}" + pause: "{{ ah_configuration_collection_loop_delay }}" no_log: "{{ ah_configuration_collection_secure_logging }}" async: "{{ ah_configuration_collection_async_timeout }}" poll: 0 diff --git a/roles/hub_collection_repository/tasks/main.yml b/roles/hub_collection_repository/tasks/main.yml index 91fb2a12a..ee43c3aca 100644 --- a/roles/hub_collection_repository/tasks/main.yml +++ b/roles/hub_collection_repository/tasks/main.yml @@ -24,7 +24,7 @@ loop_control: loop_var: __collection_repository_item label: "{{ __operation.verb }} the remote repository {{ __ah_configuration_collection_repository__item.name }} in Hub" - pause: "{{ ah_configuration_collection_repository__loop_delay }}" + pause: "{{ ah_configuration_collection_repository_loop_delay }}" no_log: "{{ ah_configuration_collection_repository_secure_logging }}" async: "{{ ah_configuration_collection_repository_async_timeout }}" poll: 0 diff --git a/roles/hub_collection_repository_sync/tasks/main.yml b/roles/hub_collection_repository_sync/tasks/main.yml index 90452c83b..1fb5762ed 100644 --- a/roles/hub_collection_repository_sync/tasks/main.yml +++ b/roles/hub_collection_repository_sync/tasks/main.yml @@ -16,7 +16,7 @@ loop_control: loop_var: __collection_repository_sync_item label: "{{ __operation.verb }} the sync {{ __ah_configuration_collection_repository_sync__item.name }} in Hub" - pause: "{{ ah_configuration_collection_repository_sync__loop_delay }}" + pause: "{{ ah_configuration_collection_repository_sync_loop_delay }}" no_log: "{{ ah_configuration_collection_repository_sync_secure_logging }}" async: "{{ ah_configuration_collection_repository_sync_async_timeout }}" poll: 0 diff --git a/roles/hub_ee_image/tasks/main.yml b/roles/hub_ee_image/tasks/main.yml index b71d79914..7d54d25a5 100644 --- a/roles/hub_ee_image/tasks/main.yml +++ b/roles/hub_ee_image/tasks/main.yml @@ -18,7 +18,7 @@ loop_control: loop_var: __ee_image_item label: "{{ __operation.verb }} the EE image {{ __ah_configuration_ee_image__item.name }} in Hub" - pause: "{{ ah_configuration_ee_image__loop_delay }}" + pause: "{{ ah_configuration_ee_image_loop_delay }}" no_log: "{{ ah_configuration_ee_image_secure_logging }}" async: "{{ ah_configuration_ee_image_async_timeout }}" poll: 0 diff --git a/roles/hub_ee_registry/tasks/main.yml b/roles/hub_ee_registry/tasks/main.yml index de8a497b2..2c4efb533 100644 --- a/roles/hub_ee_registry/tasks/main.yml +++ b/roles/hub_ee_registry/tasks/main.yml @@ -24,7 +24,7 @@ loop_control: loop_var: __ee_registry_item label: "{{ __operation.verb }} the EE registry {{ __ah_configuration_ee_registry__item.name }} in Hub" - pause: "{{ ah_configuration_ee_registry__loop_delay }}" + pause: "{{ ah_configuration_ee_registry_loop_delay }}" no_log: "{{ ah_configuration_ee_registry_secure_logging }}" async: "{{ ah_configuration_ee_registry_async_timeout }}" poll: 0 diff --git a/roles/hub_ee_registry_index/tasks/main.yml b/roles/hub_ee_registry_index/tasks/main.yml index 84c445b9f..2792cae02 100644 --- a/roles/hub_ee_registry_index/tasks/main.yml +++ b/roles/hub_ee_registry_index/tasks/main.yml @@ -17,7 +17,7 @@ loop_control: loop_var: __ee_registry_index_item label: "{{ __operation.verb }} the EE registry index {{ __ah_configuration_ee_registry_index__item.name }} in Hub" - pause: "{{ ah_configuration_ee_registry_index__loop_delay }}" + pause: "{{ ah_configuration_ee_registry_index_loop_delay }}" when: __ee_registry_index_item.index | default(false) no_log: "{{ ah_configuration_ee_registry_secure_logging }}" async: "{{ ah_configuration_ee_registry_index_async_timeout }}" diff --git a/roles/hub_ee_registry_sync/tasks/main.yml b/roles/hub_ee_registry_sync/tasks/main.yml index 0adb2e073..1cd134b95 100644 --- a/roles/hub_ee_registry_sync/tasks/main.yml +++ b/roles/hub_ee_registry_sync/tasks/main.yml @@ -17,7 +17,7 @@ loop_control: loop_var: __ee_registry_sync_item label: "{{ __operation.verb }} the EE registry sync {{ __ee_registry_sync_item.name }} in Hub" - pause: "{{ ah_configuration_registry_sync__loop_delay }}" + pause: "{{ ah_configuration_registry_sync_loop_delay }}" when: __ee_registry_sync_item.sync | default(false) no_log: "{{ ah_configuration_ee_registry_secure_logging }}" async: "{{ ah_configuration_ee_registry_sync_async_timeout }}" diff --git a/roles/hub_ee_repository/tasks/main.yml b/roles/hub_ee_repository/tasks/main.yml index 99f2de987..4f1417cf9 100644 --- a/roles/hub_ee_repository/tasks/main.yml +++ b/roles/hub_ee_repository/tasks/main.yml @@ -22,7 +22,7 @@ loop_control: loop_var: __ee_repository_item label: "{{ __operation.verb }} the EE repository {{ __ah_configuration_ee_registry_sync__item.name }} in Hub" - pause: "{{ ah_configuration_ee_registry_sync__loop_delay }}" + pause: "{{ ah_configuration_ee_registry_sync_loop_delay }}" no_log: "{{ ah_configuration_ee_repository_secure_logging }}" async: "{{ ah_configuration_ee_repository_async_timeout }}" poll: 0 diff --git a/roles/hub_ee_repository_sync/tasks/main.yml b/roles/hub_ee_repository_sync/tasks/main.yml index 7e0a76209..6026fd6a2 100644 --- a/roles/hub_ee_repository_sync/tasks/main.yml +++ b/roles/hub_ee_repository_sync/tasks/main.yml @@ -17,7 +17,7 @@ loop_control: loop_var: __ee_repository_sync_item label: "{{ __operation.verb }} the EE repository sync {{ __ah_configuration_ee_repository_sync__item.name }} in Hub" - pause: "{{ ah_configuration_ee_repository_sync__loop_delay }}" + pause: "{{ ah_configuration_ee_repository_sync_loop_delay }}" when: __ee_repository_sync_item.sync | default(false) no_log: "{{ ah_configuration_ee_repository_secure_logging }}" async: "{{ ah_configuration_ee_repository_sync_async_timeout }}" diff --git a/roles/hub_group/tasks/main.yml b/roles/hub_group/tasks/main.yml index e06f6b031..1a9a89ffc 100644 --- a/roles/hub_group/tasks/main.yml +++ b/roles/hub_group/tasks/main.yml @@ -16,7 +16,7 @@ loop_control: loop_var: __group_item label: "{{ __operation.verb }} the group {{ __ah_configuration_group__item.name }} in Hub" - pause: "{{ ah_configuration_group__loop_delay }}" + pause: "{{ ah_configuration_group_loop_delay }}" no_log: "{{ ah_configuration_group_secure_logging }}" async: "{{ ah_configuration_group_async_timeout }}" poll: 0 diff --git a/roles/hub_group_roles/tasks/main.yml b/roles/hub_group_roles/tasks/main.yml index 5998a72a9..b3925427d 100644 --- a/roles/hub_group_roles/tasks/main.yml +++ b/roles/hub_group_roles/tasks/main.yml @@ -15,7 +15,7 @@ loop_control: loop_var: __group_roles_item label: "{{ __operation.verb }} the group role {{ __ah_configuration_group_roles__item.name }} in Hub" - pause: "{{ ah_configuration_group_roles__loop_delay }}" + pause: "{{ ah_configuration_group_roles_loop_delay }}" no_log: "{{ ah_configuration_group_roles_secure_logging }}" async: "{{ ah_configuration_group_roles_async_timeout }}" poll: 0 diff --git a/roles/hub_namespace/tasks/main.yml b/roles/hub_namespace/tasks/main.yml index b59f1d85c..f156aa7d6 100644 --- a/roles/hub_namespace/tasks/main.yml +++ b/roles/hub_namespace/tasks/main.yml @@ -36,7 +36,7 @@ loop_control: loop_var: __namespace_item label: "{{ __operation.verb }} the namespace {{ __ah_configuration_namespace__item.name }} in Hub" - pause: "{{ ah_configuration_namespace__loop_delay }}" + pause: "{{ ah_configuration_namespace_loop_delay }}" no_log: "{{ ah_configuration_namespace_secure_logging }}" async: "{{ ah_configuration_namespace_async_timeout }}" poll: 0 diff --git a/roles/hub_publish/tasks/main.yml b/roles/hub_publish/tasks/main.yml index 7ca41ef47..4dab4d4ef 100644 --- a/roles/hub_publish/tasks/main.yml +++ b/roles/hub_publish/tasks/main.yml @@ -9,7 +9,7 @@ loop: "{{ ah_collections }}" loop_control: loop_var: __ah_collection_item - pause: "{{ ah_configuration_publish__loop_delay }}" + pause: "{{ ah_configuration_publish_loop_delay }}" no_log: "{{ ah_configuration_publish_secure_logging }}" when: - ah_collection_list is not defined diff --git a/roles/hub_role/tasks/main.yml b/roles/hub_role/tasks/main.yml index 8e20e46fb..4e62e35b5 100644 --- a/roles/hub_role/tasks/main.yml +++ b/roles/hub_role/tasks/main.yml @@ -17,7 +17,7 @@ loop_control: loop_var: __role_item label: "{{ __operation.verb }} the role {{ __ah_configuration_role__item.name }} to Hub" - pause: "{{ ah_configuration_role__loop_delay }}" + pause: "{{ ah_configuration_role_loop_delay }}" no_log: "{{ ah_configuration_role_secure_logging }}" async: "{{ ah_configuration_role_async_timeout }}" poll: 0 diff --git a/roles/hub_user/tasks/main.yml b/roles/hub_user/tasks/main.yml index d311a0c28..870315722 100644 --- a/roles/hub_user/tasks/main.yml +++ b/roles/hub_user/tasks/main.yml @@ -23,7 +23,7 @@ loop_control: loop_var: __user_item label: "{{ __operation.verb }} the user {{ __user_item.name }} to Hub" - pause: "{{ ah_configuration_user_accounts__loop_delay }}" + pause: "{{ ah_configuration_user_accounts_loop_delay }}" no_log: "{{ ah_configuration_user_secure_logging }}" async: "{{ ah_configuration_user_async_timeout }}" poll: 0 diff --git a/tests/configs/user_accounts.yml b/tests/configs/user_accounts.yml index 0168e926f..a3520e18f 100644 --- a/tests/configs/user_accounts.yml +++ b/tests/configs/user_accounts.yml @@ -1,6 +1,6 @@ --- aap_user_accounts: - - user: controller_user + - username: controller_user is_superuser: false password: aap_password ... diff --git a/tests/configure_platform.yml b/tests/configure_platform.yml index d7f960d77..a1e123d96 100644 --- a/tests/configure_platform.yml +++ b/tests/configure_platform.yml @@ -4,11 +4,14 @@ connection: local vars: aap_validate_certs: false - controller_configuration_secure_logging: false + aap_configuration_secure_logging: false # Define following vars here, or in configs/controller_auth.yml # aap_hostname: controller.example.com # aap_username: admin # aap_password: changeme + collections: + - ansible.controller + - infra.aap_configuration pre_tasks: @@ -80,107 +83,107 @@ roles: - dispatch # The dispatch role calls all of the other roles. - tasks: - - - name: Validate error handling - block: - - name: Add Invalid Job Templates to Controller - ansible.builtin.include_role: - name: job_templates - vars: - controller_templates: "{{ controller_templates_invalid }}" - - - name: Ensure the job_templates_errors is defined and has items - ansible.builtin.assert: - that: - - job_templates_errors is defined - - job_templates_errors | length > 0 - fail_msg: "No errors found, validate test example" - success_msg: "Errors found, proceeding" - vars: - job_templates_errors: __job_templates_errors_set_stats.ansible_stats.data.job_templates_errors - - - name: Add Controller Settings Individually - ansible.builtin.include_role: - name: settings - vars: - controller_settings: "{{ controller_settings_individuale }}" - - - name: Run ad hoc commands - ansible.builtin.include_role: - name: ad_hoc_command - when: controller_ad_hoc_commands is defined - - - name: Cancel Ad hoc commands - ansible.builtin.include_tasks: "./tasks/ad_hoc_cancel.yml" - when: controller_ad_hoc_commands is defined - - - name: Launch Controller Bulk Hosts - ansible.builtin.include_role: - name: bulk_host_create - vars: - controller_bulk_hosts: "{{ temp_controller_bulk_hosts }}" - when: - - controller_bulk_launch_jobs is defined - - - name: Launch Controller Jobs - ansible.builtin.include_role: - name: job_launch - when: controller_launch_jobs is defined - - - name: Show launched Controller jobs - ansible.builtin.debug: - var: launched_controller_jobs - - - name: Combine id output with defaults temp - ansible.builtin.set_fact: - tmp_job: "{{ {'id': item.id} }}" - with_items: "{{ launched_controller_jobs.results }}" - register: tmp_jobs - - - name: Cancel Controller Jobs - ansible.builtin.include_role: - name: jobs_cancel - vars: - controller_cancel_jobs: "{{ tmp_jobs.results | map(attribute='ansible_facts.tmp_job') | list }}" - when: launched_controller_jobs is defined - - - name: Find Job ID's - ansible.builtin.debug: - var: __job_templates_job_async_result - - - name: Launch Controller Bulk Jobs - ansible.builtin.include_role: - name: bulk_job_launch - vars: - controller_bulk_hosts: "{{ temp_controller_bulk_hosts }}" - controller_bulk_launch_jobs: - - name: My Bulk Job Launch - jobs: - - unified_job_template: "{{ __job_templates_job_async_result.results[0].id }}" - - unified_job_template: "{{ __job_templates_job_async_result.results[1].id }}" - organization: Default - wait: false - when: - - controller_bulk_launch_jobs is defined - - - name: Launch Controller workflows - ansible.builtin.include_role: - name: workflow_launch - when: controller_workflow_launch_jobs is defined - - - name: Launched Workflows - ansible.builtin.debug: - var: launched_controller_workflows - - - name: Wait for workflow to finish - job_wait: - job_id: "{{ launched_controller_workflows.results[0].id }}" - job_type: workflow_jobs - timeout: 180 - aap_username: "{{ aap_username }}" - aap_password: "{{ aap_password }}" - controller_host: "{{ aap_hostname }}" - validate_certs: "{{ aap_validate_certs }}" - ignore_errors: true # noqa ignore-errors + # tasks: + + # - name: Validate error handling + # block: + # - name: Add Invalid Job Templates to Controller + # ansible.builtin.include_role: + # name: job_templates + # vars: + # controller_templates: "{{ controller_templates_invalid }}" + + # - name: Ensure the job_templates_errors is defined and has items + # ansible.builtin.assert: + # that: + # - job_templates_errors is defined + # - job_templates_errors | length > 0 + # fail_msg: "No errors found, validate test example" + # success_msg: "Errors found, proceeding" + # vars: + # job_templates_errors: __job_templates_errors_set_stats.ansible_stats.data.job_templates_errors + + # - name: Add Controller Settings Individually + # ansible.builtin.include_role: + # name: settings + # vars: + # controller_settings: "{{ controller_settings_individuale }}" + + # - name: Run ad hoc commands + # ansible.builtin.include_role: + # name: ad_hoc_command + # when: controller_ad_hoc_commands is defined + + # - name: Cancel Ad hoc commands + # ansible.builtin.include_tasks: "./tasks/ad_hoc_cancel.yml" + # when: controller_ad_hoc_commands is defined + + # - name: Launch Controller Bulk Hosts + # ansible.builtin.include_role: + # name: bulk_host_create + # vars: + # controller_bulk_hosts: "{{ temp_controller_bulk_hosts }}" + # when: + # - controller_bulk_launch_jobs is defined + + # - name: Launch Controller Jobs + # ansible.builtin.include_role: + # name: job_launch + # when: controller_launch_jobs is defined + + # - name: Show launched Controller jobs + # ansible.builtin.debug: + # var: launched_controller_jobs + + # - name: Combine id output with defaults temp + # ansible.builtin.set_fact: + # tmp_job: "{{ {'id': item.id} }}" + # with_items: "{{ launched_controller_jobs.results }}" + # register: tmp_jobs + + # - name: Cancel Controller Jobs + # ansible.builtin.include_role: + # name: jobs_cancel + # vars: + # controller_cancel_jobs: "{{ tmp_jobs.results | map(attribute='ansible_facts.tmp_job') | list }}" + # when: launched_controller_jobs is defined + + # - name: Find Job ID's + # ansible.builtin.debug: + # var: __job_templates_job_async_result + + # - name: Launch Controller Bulk Jobs + # ansible.builtin.include_role: + # name: bulk_job_launch + # vars: + # controller_bulk_hosts: "{{ temp_controller_bulk_hosts }}" + # controller_bulk_launch_jobs: + # - name: My Bulk Job Launch + # jobs: + # - unified_job_template: "{{ __job_templates_job_async_result.results[0].id }}" + # - unified_job_template: "{{ __job_templates_job_async_result.results[1].id }}" + # organization: Default + # wait: false + # when: + # - controller_bulk_launch_jobs is defined + + # - name: Launch Controller workflows + # ansible.builtin.include_role: + # name: workflow_launch + # when: controller_workflow_launch_jobs is defined + + # - name: Launched Workflows + # ansible.builtin.debug: + # var: launched_controller_workflows + + # - name: Wait for workflow to finish + # job_wait: + # job_id: "{{ launched_controller_workflows.results[0].id }}" + # job_type: workflow_jobs + # timeout: 180 + # aap_username: "{{ aap_username }}" + # aap_password: "{{ aap_password }}" + # controller_host: "{{ aap_hostname }}" + # validate_certs: "{{ aap_validate_certs }}" + # ignore_errors: true # noqa ignore-errors ...