diff --git a/CHANGELOG.rst b/CHANGELOG.rst index da3c4bec8..307ce68cb 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,9 +1,41 @@ -============================================ +====================================== infra.aap_configuration Release Notes -============================================ +====================================== .. contents:: Topics +v3.0.0 +====== + +Release Summary +--------------- + +| Release Date: 2024-10-31 +| The collection has been updated for AAP 2.5 use and has only been tested against AAP 2.5, it has been updated to include the previously separated hub, eda, and gateway collection roles. +| `Conversion Guide `__ + +Major Changes +------------- + +- Introduction of roles for gateway +- Rename of collection to infra.aap_configuration +- Roles from infra.ah_configuration and infra.eda_configuration have migrated into this collection + +Breaking Changes / Porting Guide +-------------------------------- + +- Major overhaul to all code completed, variables have changed, role names have changed, please see the Conversion guide for more details. + +Removed Features (previously deprecated) +---------------------------------------- + +- ee_namespace role has been removed, this was removed in AAP 2.4, and was depreciated then. + +Bugfixes +-------- + +- Controller credentials role now includes request timeout option. +- meta_dependency_check set to default to false. This is due to feature not working on controller, or in offline environments without a hub. Set controller_dependency_check to 'true' to re-enable feature. v2.11.0 ======= diff --git a/changelogs/.plugin-cache.yaml b/changelogs/.plugin-cache.yaml index fea5c0ac6..fb3ef1d31 100644 --- a/changelogs/.plugin-cache.yaml +++ b/changelogs/.plugin-cache.yaml @@ -1,154 +1,309 @@ objects: role: - ad_hoc_command: + ansible_config: + description: An Ansible Role to create ansible.cfg files based on your Automation + Hub servers + name: ansible_config + version_added: null + controller_ad_hoc_command: description: An Ansible Role to run a list of ad hoc commands on Ansible Controller. - name: ad_hoc_command + name: controller_ad_hoc_command version_added: null - ad_hoc_command_cancel: + controller_ad_hoc_command_cancel: description: An Ansible Role to cancel a list of ad hoc commands on Ansible Controller. - name: ad_hoc_command_cancel + name: controller_ad_hoc_command_cancel version_added: null - applications: + controller_applications: description: An Ansible Role to create Applications on Ansible Controller. - name: applications + name: controller_applications version_added: null - bulk_host_create: + controller_bulk_host_create: description: An Ansible Role to run a list of ad hoc commands on Ansible Controller. - name: bulk_host_create + name: controller_bulk_host_create version_added: null - bulk_job_launch: + controller_bulk_job_launch: description: An Ansible Role to run a list of ad hoc commands on Ansible Controller. - name: bulk_job_launch + name: controller_bulk_job_launch version_added: null - credential_input_sources: + controller_credential_input_sources: description: An Ansible Role to create Credential Input Sources on Ansible Controller. - name: credential_input_sources + name: controller_credential_input_sources version_added: null - credential_types: + controller_credential_types: description: An Ansible Role to create credential types on Ansible Controller. - name: credential_types + name: controller_credential_types version_added: null - credentials: + controller_credentials: description: An Ansible Role to create credentials on Ansible Controller. - name: credentials - version_added: null - dispatch: - description: An Ansible Role to call other roles to create objects on Ansible - Controller. - name: dispatch + name: controller_credentials version_added: null - execution_environments: + controller_execution_environments: description: An Ansible Role to create execution environment objects on Ansible Controller. - name: execution_environments - version_added: null - filetree_create: - description: An Ansible Role to create a local file tree of objects existing - in Controller - name: filetree_create - version_added: null - filetree_read: - description: An Ansible Role to read from a local file tree and create objects - in Controller - name: filetree_read + name: controller_execution_environments version_added: null - groups: + controller_host_groups: description: An Ansible Role to create groups on Ansible Controller. - name: groups + name: controller_host_groups version_added: null - hosts: + controller_hosts: description: An Ansible Role to create hosts on Ansible Controller. - name: hosts + name: controller_hosts version_added: null - instance_groups: + controller_instance_groups: description: An Ansible Role to create instance groups on Ansible Controller. - name: instance_groups + name: controller_instance_groups version_added: null - instances: + controller_instances: description: An Ansible Role to create instances on Ansible Controller. - name: instances + name: controller_instances version_added: null - inventories: + controller_inventories: description: An Ansible Role to create inventories on Ansible Controller. - name: inventories + name: controller_inventories version_added: null - inventory_source_update: + controller_inventory_source_update: description: An Ansible Role to update inventory sources on Ansible Controller. - name: inventory_source_update + name: controller_inventory_source_update version_added: null - inventory_sources: + controller_inventory_sources: description: An Ansible Role to create inventory sources on Ansible Controller. - name: inventory_sources + name: controller_inventory_sources version_added: null - job_launch: + controller_job_launch: description: An Ansible Role to launch jobs on Ansible Controller. - name: job_launch + name: controller_job_launch version_added: null - job_templates: + controller_job_templates: description: An Ansible Role to create job templates on Ansible Controller. - name: job_templates + name: controller_job_templates version_added: null - jobs_cancel: + controller_jobs_cancel: description: An Ansible Role to cancel a list of jobs on Ansible Controller. - name: jobs_cancel + name: controller_jobs_cancel version_added: null - labels: + controller_labels: description: An Ansible Role to create labels on Ansible Controller. - name: labels + name: controller_labels version_added: null - license: + controller_license: description: An Ansible Role to deploy a license on Ansible Controller. - name: license + name: controller_license version_added: null - notification_templates: + controller_notification_templates: description: An Ansible Role to create notification templates on Ansible Controller. - name: notification_templates + name: controller_notification_templates version_added: null - object_diff: - description: An Ansible Role to read from a local file tree and create objects - in Controller - name: object_diff - version_added: null - organizations: + controller_organizations: description: An Ansible Role to create organizations on Ansible Controller. - name: organizations + name: controller_organizations version_added: null - project_update: + controller_project_update: description: An Ansible Role to update projects on Ansible Controller. - name: project_update + name: controller_project_update version_added: null - projects: + controller_projects: description: An Ansible Role to create projects on Ansible Controller. - name: projects + name: controller_projects version_added: null - roles: + controller_roles: description: An Ansible Role to create roles on Ansible Controller. - name: roles + name: controller_roles version_added: null - schedules: + controller_schedules: description: An Ansible Role to create schedules on Ansible Controller. - name: schedules + name: controller_schedules version_added: null - settings: + controller_settings: description: An Ansible Role to create settings on Ansible Controller. - name: settings + name: controller_settings version_added: null - teams: + controller_teams: description: An Ansible Role to create teams on Ansible Controller. - name: teams + name: controller_teams version_added: null - users: + controller_users: description: An Ansible Role to create users on Ansible Controller. - name: users + name: controller_users version_added: null - workflow_job_templates: + controller_workflow_job_templates: description: An Ansible Role to create workflow job templates on Ansible Controller. - name: workflow_job_templates + name: controller_workflow_job_templates version_added: null - workflow_launch: + controller_workflow_launch: description: An Ansible Role to launch workflows on Ansible Controller. - name: workflow_launch + name: controller_workflow_launch + version_added: null + dispatch: + description: An Ansible Role to call other roles to create objects on Ansible + Automation Platform. + name: dispatch + version_added: null + eda_controller_tokens: + description: An Ansible Role to create user tokens in EDA controller. + name: eda_controller_tokens + version_added: null + eda_credential_types: + description: An Ansible Role to create credentials in EDA controller. + name: eda_credential_types + version_added: null + eda_credentials: + description: An Ansible Role to create credentials in EDA controller. + name: eda_credentials + version_added: null + eda_decision_environments: + description: An Ansible Role to create decision environments in EDA controller. + name: eda_decision_environments + version_added: null + eda_event_streams: + description: An Ansible Role to create event streams in EDA controller. + name: eda_event_streams + version_added: null + eda_projects: + description: An Ansible Role to create projects in EDA controller. + name: eda_projects + version_added: null + eda_rulebook_activations: + description: An Ansible Role to create rulebook activations in EDA controller. + name: eda_rulebook_activations + version_added: null + eda_users: + description: An Ansible Role to create users in EDA controller. + name: eda_users + version_added: null + gateway_applications: + description: An Ansible Role to create Applications on Ansible gateway. + name: gateway_applications + version_added: null + gateway_authenticator_maps: + description: An Ansible Role to create authenticator maps on automation platform + gateway. + name: gateway_authenticator_maps + version_added: null + gateway_authenticators: + description: An Ansible Role to create authenticators on automation platform + gateway. + name: gateway_authenticators + version_added: null + gateway_http_ports: + description: An Ansible Role to create http ports on automation platform gateway. + name: gateway_http_ports + version_added: null + gateway_organizations: + description: An Ansible Role to create organizations on automation platform + gateway. + name: gateway_organizations + version_added: null + gateway_role_user_assignments: + description: An Ansible Role to create role user assignment on automation platform + gateway. + name: gateway_role_user_assignments + version_added: null + gateway_routes: + description: An Ansible Role to create service nodes on automation platform + gateway. + name: gateway_routes + version_added: null + gateway_service_clusters: + description: An Ansible Role to create service clusters on automation platform + gateway. + name: gateway_service_clusters + version_added: null + gateway_service_keys: + description: An Ansible Role to create service keys on automation platform gateway. + name: gateway_service_keys + version_added: null + gateway_service_nodes: + description: An Ansible Role to create service nodes on automation platform + gateway. + name: gateway_service_nodes + version_added: null + gateway_services: + description: An Ansible Role to create services on automation platform gateway. + name: gateway_services + version_added: null + gateway_settings: + description: An Ansible Role to create settings on automation platform gateway. + name: gateway_settings + version_added: null + gateway_teams: + description: An Ansible Role to create teams on automation platform gateway. + name: gateway_teams + version_added: null + gateway_users: + description: An Ansible Role to create users on automation platform gateway. + name: gateway_users + version_added: null + hub_collection: + description: An Ansible Role to update, or destroy Automation Hub Collections. + name: hub_collection + version_added: null + hub_collection_remote: + description: An Ansible Role to create collection remotes in Automation Hub. + name: hub_collection_remote + version_added: null + hub_collection_repository: + description: An Ansible Role to create collection remotes in Automation Hub. + name: hub_collection_repository + version_added: null + hub_collection_repository_sync: + description: An Ansible Role to create collection remotes in Automation Hub. + name: hub_collection_repository_sync + version_added: null + hub_ee_image: + description: An Ansible Role to create execution environment images in Automation + Hub. + name: hub_ee_image + version_added: null + hub_ee_registry: + description: An Ansible Role to create execution environment registry in Automation + Hub. + name: hub_ee_registry + version_added: null + hub_ee_registry_index: + description: An Ansible Role to index execution environment registries in Automation + Hub. + name: hub_ee_registry_index + version_added: null + hub_ee_registry_sync: + description: An Ansible Role to sync execution environment registries in Automation + Hub. + name: hub_ee_registry_sync + version_added: null + hub_ee_repository: + description: An Ansible Role to create execution environment repositories in + Automation Hub. + name: hub_ee_repository + version_added: null + hub_ee_repository_sync: + description: An Ansible Role to sync execution environment repositories in Automation + Hub. + name: hub_ee_repository_sync + version_added: null + hub_group: + description: An Ansible Role to create groups in Automation Hub. + name: hub_group + version_added: null + hub_group_roles: + description: An Ansible Role to create groups roles in Automation Hub. + name: hub_group_roles + version_added: null + hub_namespace: + description: An Ansible Role to create namespaces in Automation Hub. + name: hub_namespace + version_added: null + hub_publish: + description: An Ansible Role to publish collections in Automation Hub. + name: hub_publish + version_added: null + hub_role: + description: An Ansible Role to create role permissions in Automation Hub. + name: hub_role + version_added: null + hub_user: + description: An Ansible Role to create users in Automation Hub. + name: hub_user version_added: null plugins: become: {} @@ -159,21 +314,11 @@ plugins: filter: {} httpapi: {} inventory: {} - lookup: - controller_object_diff: - description: Return difference for objects from Controller API - name: controller_object_diff - version_added: null - module: - controller_export_diff: - description: Compare controller configuration resources with those defined in - code. - name: controller_export_diff - namespace: '' - version_added: null + lookup: {} + module: {} netconf: {} shell: {} strategy: {} test: {} vars: {} -version: 2.11.0 +version: 3.0.0 diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index 81c176f7a..50050188d 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -729,3 +729,34 @@ releases: - pause_loop.yml - var_spaces.yml release_date: '2024-09-23' + 3.0.0: + changes: + breaking_changes: + - Major overhaul to all code completed, variables have changed, role names have + changed, please see the Conversion guide for more details. + bugfixes: + - Controller credentials role now includes request timeout option. + - meta_dependency_check set to default to false. This is due to feature not + working on controller, or in offline environments without a hub. Set controller_dependency_check + to 'true' to re-enable feature. + major_changes: + - Introduction of roles for gateway + - Rename of collection to infra.aap_configuration + - Roles from infra.ah_configuration and infra.eda_configuration have migrated + into this collection + release_summary: '| Release Date: 2024-10-31 + + | The collection has been updated for AAP 2.5 use and has only been tested + against AAP 2.5, it has been updated to include the previously separated hub, + eda, and gateway collection roles. + + | `Conversion Guide `__ + + ' + removed_features: + - ee_namespace role has been removed, this was removed in AAP 2.4, and was depreciated + then. + fragments: + - Rewrite.yml + - ee_namespace_removed.yml + release_date: '2024-11-08' diff --git a/changelogs/fragments/Rewrite.yml b/changelogs/fragments/Rewrite.yml deleted file mode 100644 index 8afaf451f..000000000 --- a/changelogs/fragments/Rewrite.yml +++ /dev/null @@ -1,14 +0,0 @@ ---- -release_summary: | - | Release Date: 2024-10-31 - | The collection has been updated for AAP 2.5 use and has only been tested against AAP 2.5, it has been updated to include the previously separated hub, eda, and gateway collection roles. - | `Conversion Guide `__ -breaking_changes: - - Major overhaul to all code completed, variables have changed, role names have changed, please see the Conversion guide for more details. -major_changes: - - Roles from infra.ah_configuration and infra.eda_configuration have migrated into this collection - - Rename of collection to infra.aap_configuration - - Introduction of roles for gateway -bugfixes: - - Controller credentials role now includes request timeout option. - - meta_dependency_check set to default to false. This is due to feature not working on controller, or in offline environments without a hub. Set controller_dependency_check to 'true' to re-enable feature. diff --git a/changelogs/fragments/ee_namespace_removed.yml b/changelogs/fragments/ee_namespace_removed.yml deleted file mode 100644 index c1a153801..000000000 --- a/changelogs/fragments/ee_namespace_removed.yml +++ /dev/null @@ -1,2 +0,0 @@ -removed_features: - - ee_namespace role has been removed, this was removed in AAP 2.4, and was depreciated then. diff --git a/changelogs/fragments/hub_vars.yml b/changelogs/fragments/hub_vars.yml index 51c79211a..ca42162b4 100644 --- a/changelogs/fragments/hub_vars.yml +++ b/changelogs/fragments/hub_vars.yml @@ -1,4 +1,6 @@ --- major_changes: - renamed some more vars that got missed in the new naming convention. +bugfixes: + - updated gateway services async and no log vars to correct naming convention. ... diff --git a/roles/gateway_routes/tasks/main.yml b/roles/gateway_routes/tasks/main.yml index a56e8815c..0a1769392 100644 --- a/roles/gateway_routes/tasks/main.yml +++ b/roles/gateway_routes/tasks/main.yml @@ -45,7 +45,7 @@ loop: "{{ __gateway_routes_job_async.results }}" loop_control: loop_var: __gateway_routes_job_async_results_item - label: "{{ __operation.verb }} Label {{ __gateway_routes_job_async_results_item.__gateway_routes_item.name }} | Wait for finish the Label {{ __operation.action }}" + label: "{{ __operation.verb }} Gateway route {{ __gateway_routes_job_async_results_item.__gateway_routes_item.name }} | Wait for finish the Gateway route {{ __operation.action }}" when: __gateway_routes_job_async_results_item.ansible_job_id is defined no_log: "{{ gateway_routes_secure_logging }}" vars: diff --git a/roles/gateway_service_clusters/tasks/main.yml b/roles/gateway_service_clusters/tasks/main.yml index cac1bf81f..c5c3cd33c 100644 --- a/roles/gateway_service_clusters/tasks/main.yml +++ b/roles/gateway_service_clusters/tasks/main.yml @@ -47,7 +47,7 @@ loop: "{{ __gateway_service_clusters_job_async.results }}" loop_control: loop_var: __gateway_service_clusters_job_async_results_item - label: "{{ __operation.verb }} Label {{ __gateway_service_clusters_job_async_results_item.__gateway_service_clusters_item.name }} | Wait for finish the Label + label: "{{ __operation.verb }} Gateway service cluster {{ __gateway_service_clusters_job_async_results_item.__gateway_service_clusters_item.name }} | Wait for finish the Gateway service cluster {{ __operation.action }}" when: __gateway_service_clusters_job_async_results_item.ansible_job_id is defined no_log: "{{ gateway_service_clusters_secure_logging }}" diff --git a/roles/gateway_service_keys/tasks/main.yml b/roles/gateway_service_keys/tasks/main.yml index e351a2a0c..58a8d7746 100644 --- a/roles/gateway_service_keys/tasks/main.yml +++ b/roles/gateway_service_keys/tasks/main.yml @@ -42,7 +42,7 @@ loop: "{{ __gateway_service_keys_job_async.results }}" loop_control: loop_var: __gateway_service_keys_job_async_results_item - label: "{{ __operation.verb }} Label {{ __gateway_service_keys_job_async_results_item.__gateway_service_keys_item.name }} | Wait for finish the Label {{ __operation.action }}" + label: "{{ __operation.verb }} Gateway service key {{ __gateway_service_keys_job_async_results_item.__gateway_service_keys_item.name }} | Wait for finish the Gateway service key {{ __operation.action }}" when: __gateway_service_keys_job_async_results_item.ansible_job_id is defined no_log: "{{ gateway_service_keys_secure_logging }}" vars: diff --git a/roles/gateway_service_nodes/tasks/main.yml b/roles/gateway_service_nodes/tasks/main.yml index 3b1d3793a..9251a1067 100644 --- a/roles/gateway_service_nodes/tasks/main.yml +++ b/roles/gateway_service_nodes/tasks/main.yml @@ -39,7 +39,7 @@ loop: "{{ __gateway_service_nodes_job_async.results }}" loop_control: loop_var: __gateway_service_nodes_job_async_results_item - label: "{{ __operation.verb }} Label {{ __gateway_service_nodes_job_async_results_item.__gateway_service_nodes_item.name }} | Wait for finish the Label {{ __operation.action }}" + label: "{{ __operation.verb }} Gateway service node {{ __gateway_service_nodes_job_async_results_item.__gateway_service_nodes_item.name }} | Wait for finish the Gateway service node {{ __operation.action }}" when: __gateway_service_nodes_job_async_results_item.ansible_job_id is defined no_log: "{{ gateway_service_nodes_secure_logging }}" vars: diff --git a/roles/gateway_services/tasks/main.yml b/roles/gateway_services/tasks/main.yml index 5c94fd8dc..778e55501 100644 --- a/roles/gateway_services/tasks/main.yml +++ b/roles/gateway_services/tasks/main.yml @@ -27,7 +27,7 @@ loop_var: __gateway_services_item label: "{{ __operation.verb }} the Gateway service {{ __gateway_services_item.name }}" pause: "{{ gateway_services_loop_delay }}" - no_log: "{{ services_secure_logging }}" + no_log: "{{ gateway_services_secure_logging }}" async: 1000 poll: 0 register: __gateway_services_job_async @@ -41,14 +41,14 @@ jid: "{{ __gateway_services_job_async_results_item.ansible_job_id }}" register: __gateway_services_job_async_result until: __gateway_services_job_async_result.finished - retries: "{{ services_async_retries }}" - delay: "{{ services_async_delay }}" + retries: "{{ gateway_services_async_retries }}" + delay: "{{ gateway_services_async_delay }}" loop: "{{ __gateway_services_job_async.results }}" loop_control: loop_var: __gateway_services_job_async_results_item - label: "{{ __operation.verb }} Label {{ __gateway_services_job_async_results_item.__gateway_services_item.name }} | Wait for finish the Label {{ __operation.action }}" + label: "{{ __operation.verb }} Gateway service {{ __gateway_services_job_async_results_item.__gateway_services_item.name }} | Wait for finish the Gateway service {{ __operation.action }}" when: __gateway_services_job_async_results_item.ansible_job_id is defined - no_log: "{{ services_secure_logging }}" + no_log: "{{ gateway_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 }}" diff --git a/roles/gateway_teams/tasks/main.yml b/roles/gateway_teams/tasks/main.yml index b942f9c22..e723ce5b9 100644 --- a/roles/gateway_teams/tasks/main.yml +++ b/roles/gateway_teams/tasks/main.yml @@ -39,7 +39,7 @@ loop: "{{ __gateway_teams_job_async.results }}" loop_control: loop_var: __gateway_teams_job_async_results_item - label: "{{ __operation.verb }} Label {{ __gateway_teams_job_async_results_item.__gateway_teams_item.name }} | Wait for finish the Label {{ __operation.action }}" + label: "{{ __operation.verb }} Gateway team {{ __gateway_teams_job_async_results_item.__gateway_teams_item.name }} | Wait for finish the Gateway team {{ __operation.action }}" when: __gateway_teams_job_async_results_item.ansible_job_id is defined no_log: "{{ gateway_teams_secure_logging }}" vars: diff --git a/roles/gateway_users/tasks/main.yml b/roles/gateway_users/tasks/main.yml index e142fc122..4dff2df8a 100644 --- a/roles/gateway_users/tasks/main.yml +++ b/roles/gateway_users/tasks/main.yml @@ -45,7 +45,7 @@ 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_job_async_results_item.__gateway_user_accounts_item.username }} | Wait for finish the Label {{ __operation.action }}" + label: "{{ __operation.verb }} Gateway user {{ __gateway_user_accounts_job_async_result.__gateway_user_accounts_job_async_results_item.__gateway_user_accounts_item.username }} | Wait for finish the Gateway user {{ __operation.action }}" when: __gateway_user_accounts_job_async_results_item.ansible_job_id is defined no_log: "{{ gateway_users_secure_logging }}" vars: diff --git a/roles/hub_collection/tasks/main.yml b/roles/hub_collection/tasks/main.yml index 81a49d317..4af6bb39a 100644 --- a/roles/hub_collection/tasks/main.yml +++ b/roles/hub_collection/tasks/main.yml @@ -1,19 +1,5 @@ # Update or destroy Automation Hub Collection --- -# Test if this is still needed -# - name: Get token -# ansible.hub.ah_token: -# ah_host: "{{ aap_hostname | default(omit) }}" -# ah_username: "{{ aap_username | default(omit) }}" -# ah_password: "{{ aap_password | default(omit) }}" -# ah_path_prefix: "{{ ah_path_prefix | default(omit) }}" -# validate_certs: "{{ aap_validate_certs | default(omit) }}" -# request_timeout: "{{ aap_request_timeout | default(omit) }}" -# when: -# - ah_token is not defined -# - lookup("ansible.builtin.env", "AH_API_TOKEN") == "" -# - hub_collections | length > 1 - - name: Update or destroy Automation Hub Collection ansible.hub.ah_collection: namespace: "{{ __hub_collection_item.namespace }}" diff --git a/roles/hub_ee_image/tasks/main.yml b/roles/hub_ee_image/tasks/main.yml index f6324f49f..355486929 100644 --- a/roles/hub_ee_image/tasks/main.yml +++ b/roles/hub_ee_image/tasks/main.yml @@ -37,7 +37,7 @@ loop: "{{ __ee_images_job_async.results }}" loop_control: loop_var: __ee_images_job_async_result_item - label: "{{ __operation.verb }} Label {{ __ee_images_job_async_result_item.__ee_image_item.name }} | Wait for finish the Label {{ __operation.action }}" + label: "{{ __operation.verb }} EE Image {{ __ee_images_job_async_result_item.__ee_image_item.name }} | Wait for finish the EE image {{ __operation.action }}" when: __ee_images_job_async_result_item.ansible_job_id is defined no_log: "{{ hub_configuration_ee_image_secure_logging }}" vars: diff --git a/roles/hub_ee_registry/tasks/main.yml b/roles/hub_ee_registry/tasks/main.yml index 269b0a54c..4a5ae2c56 100644 --- a/roles/hub_ee_registry/tasks/main.yml +++ b/roles/hub_ee_registry/tasks/main.yml @@ -43,7 +43,7 @@ loop: "{{ __ee_registries_job_async.results }}" loop_control: loop_var: __ee_registries_job_async_result_item - label: "{{ __operation.verb }} Label {{ __ee_registries_job_async_result_item.__hub_ee_registry_item.name }} | Wait for finish the Label {{ __operation.action }}" + label: "{{ __operation.verb }} EE Registry {{ __ee_registries_job_async_result_item.__hub_ee_registry_item.name }} | Wait for finish the EE Registry {{ __operation.action }}" when: __ee_registries_job_async_result_item.ansible_job_id is defined no_log: "{{ hub_configuration_ee_registry_secure_logging }}" vars: diff --git a/roles/hub_ee_registry_index/tasks/main.yml b/roles/hub_ee_registry_index/tasks/main.yml index f4f7f1034..2dd517efe 100644 --- a/roles/hub_ee_registry_index/tasks/main.yml +++ b/roles/hub_ee_registry_index/tasks/main.yml @@ -37,7 +37,7 @@ loop: "{{ __ee_registry_indexes_job_async.results }}" loop_control: loop_var: __ee_registry_indexes_job_async_result_item - label: "{{ __operation.verb }} Label {{ __ee_registry_indexes_job_async_result_item.__hub_ee_registry_index_item.name }} | Wait for finish the Label {{ __operation.action }}" + label: "{{ __operation.verb }} EE registry index {{ __ee_registry_indexes_job_async_result_item.__hub_ee_registry_index_item.name }} | Wait for finish the EE registry index {{ __operation.action }}" when: __ee_registry_indexes_job_async_result_item.ansible_job_id is defined no_log: "{{ hub_configuration_ee_registry_secure_logging }}" vars: diff --git a/roles/hub_ee_registry_sync/tasks/main.yml b/roles/hub_ee_registry_sync/tasks/main.yml index b3b06bd21..894852296 100644 --- a/roles/hub_ee_registry_sync/tasks/main.yml +++ b/roles/hub_ee_registry_sync/tasks/main.yml @@ -37,7 +37,7 @@ loop: "{{ __ee_registry_syncs_job_async.results }}" loop_control: loop_var: __ee_registry_syncs_job_async_result_item - label: "{{ __operation.verb }} Label {{ __ee_registry_syncs_job_async_result_item.__hub_ee_registry_sync_item.name }} | Wait for finish the Label {{ __operation.action }}" + label: "{{ __operation.verb }} EE registry sync {{ __ee_registry_syncs_job_async_result_item.__hub_ee_registry_sync_item.name }} | Wait for finish the EE registry sync {{ __operation.action }}" when: __ee_registry_syncs_job_async_result_item.ansible_job_id is defined no_log: "{{ hub_configuration_ee_registry_secure_logging }}" vars: diff --git a/roles/hub_ee_repository/tasks/main.yml b/roles/hub_ee_repository/tasks/main.yml index 646c057f7..a5b7ddf9d 100644 --- a/roles/hub_ee_repository/tasks/main.yml +++ b/roles/hub_ee_repository/tasks/main.yml @@ -41,7 +41,7 @@ loop: "{{ __ee_repositories_job_async.results }}" loop_control: loop_var: __ee_repositories_job_async_result_item - label: "{{ __operation.verb }} Label {{ __ee_repositories_job_async_result_item.__hub_ee_repository_sync_item.name }} | Wait for finish the Label {{ __operation.action }}" + label: "{{ __operation.verb }} EE Repository {{ __ee_repositories_job_async_result_item.__hub_ee_repository_sync_item.name }} | Wait for finish the EE Repository {{ __operation.action }}" when: __ee_repositories_job_async_result_item.ansible_job_id is defined no_log: "{{ hub_configuration_ee_repository_secure_logging }}" vars: diff --git a/roles/hub_ee_repository_sync/tasks/main.yml b/roles/hub_ee_repository_sync/tasks/main.yml index cf8d97852..4ada96c34 100644 --- a/roles/hub_ee_repository_sync/tasks/main.yml +++ b/roles/hub_ee_repository_sync/tasks/main.yml @@ -37,7 +37,7 @@ loop: "{{ __ee_repository_syncs_job_async.results }}" loop_control: loop_var: __ee_repository_syncs_job_async_result_item - label: "{{ __operation.verb }} Label {{ __ee_repository_syncs_job_async_result_item.__hub_ee_repository_sync_item.name }} | Wait for finish the Label {{ __operation.action }}" + label: "{{ __operation.verb }} EE repository sync {{ __ee_repository_syncs_job_async_result_item.__hub_ee_repository_sync_item.name }} | Wait for finish the EE repository sync {{ __operation.action }}" when: __ee_repository_syncs_job_async_result_item.ansible_job_id is defined no_log: "{{ hub_configuration_ee_repository_secure_logging }}" vars: diff --git a/roles/hub_group/tasks/main.yml b/roles/hub_group/tasks/main.yml index e34cd4a5a..0e90d2d8c 100644 --- a/roles/hub_group/tasks/main.yml +++ b/roles/hub_group/tasks/main.yml @@ -35,7 +35,7 @@ loop: "{{ __groups_job_async.results }}" loop_control: loop_var: __groups_job_async_result_item - label: "{{ __operation.verb }} Label {{ __groups_job_async_result_item.__hub_group_item.name }} | Wait for finish the Label {{ __operation.action }}" + label: "{{ __operation.verb }} Group {{ __groups_job_async_result_item.__hub_group_item.name }} | Wait for finish the Group {{ __operation.action }}" when: __groups_job_async_result_item.ansible_job_id is defined no_log: "{{ hub_configuration_group_secure_logging }}" vars: diff --git a/roles/hub_group_roles/tasks/main.yml b/roles/hub_group_roles/tasks/main.yml index c9bf58b5b..627fe885b 100644 --- a/roles/hub_group_roles/tasks/main.yml +++ b/roles/hub_group_roles/tasks/main.yml @@ -35,7 +35,7 @@ loop: "{{ __group_roles_job_async.results }}" loop_control: loop_var: __group_roles_job_async_result_item - label: "{{ __operation.verb }} Label {{ __group_roles_job_async_result_item.__hub_group_roles_item.groups }} | Wait for finish the Label {{ __operation.action }}" + label: "{{ __operation.verb }} Group roles {{ __group_roles_job_async_result_item.__hub_group_roles_item.groups }} | Wait for finish the Group roles {{ __operation.action }}" when: __group_roles_job_async_result_item.ansible_job_id is defined no_log: "{{ hub_configuration_group_roles_secure_logging }}" vars: diff --git a/tests/configs/gateway/services.yml b/tests/configs/gateway/services.yml index 4716a5c67..edc730072 100644 --- a/tests/configs/gateway/services.yml +++ b/tests/configs/gateway/services.yml @@ -1,4 +1,5 @@ --- +services_secure_logging: false https_port_lookup: "{{ lookup('ansible.platform.gateway_api', 'http_ports', query_params={ 'is_api_port': true }, host=aap_hostname, username=aap_username, password=aap_password, verify_ssl=false, expect_one=true) }}" gateway_services_lookup: "{{ lookup('ansible.platform.gateway_api', 'services', query_params={ 'name': 'gateway api' }, host=aap_hostname, username=aap_username, @@ -16,13 +17,14 @@ http_ports: is_api_port: true gateway_services: - - name: Controller API + - name: controller api state: exists - name: gateway api http_port: port-443 service_cluster: gateway service_path: / service_port: "{{ gateway_services_lookup.service_port | int }}" + state: exists gateway_service_nodes: - name: "{{ service_node_name }}"