From 40b69e92eae56f01386212c048fd209f89ad7cec Mon Sep 17 00:00:00 2001 From: David Danielsson Date: Tue, 22 Oct 2024 12:02:37 -0500 Subject: [PATCH] modified: CONVERSION_GUIDE.md modified: roles/eda_controller_tokens/meta/main.yml modified: roles/eda_credentials/meta/main.yml modified: roles/eda_decision_environments/meta/main.yml modified: roles/eda_projects/meta/main.yml modified: roles/eda_rulebook_activations/meta/main.yml modified: roles/eda_users/meta/main.yml modified: roles/gateway_applications/meta/main.yml modified: roles/gateway_authenticator_maps/meta/main.yml modified: roles/gateway_authenticators/meta/main.yml modified: roles/gateway_http_ports/meta/main.yml modified: roles/gateway_organizations/meta/main.yml modified: roles/gateway_role_user_assignments/meta/main.yml modified: roles/gateway_routes/meta/main.yml modified: roles/gateway_service_clusters/meta/main.yml modified: roles/gateway_service_keys/meta/main.yml modified: roles/gateway_service_nodes/meta/main.yml modified: roles/gateway_services/meta/main.yml modified: roles/gateway_settings/meta/main.yml modified: roles/gateway_teams/meta/main.yml modified: roles/gateway_users/meta/main.yml modified: roles/hub_collection/meta/main.yml modified: roles/hub_collection_remote/meta/main.yml modified: roles/hub_collection_repository/meta/main.yml modified: roles/hub_collection_repository_sync/meta/main.yml modified: roles/hub_ee_image/meta/main.yml modified: roles/hub_ee_registry/meta/main.yml modified: roles/hub_ee_registry_index/meta/main.yml modified: roles/hub_ee_registry_sync/meta/main.yml modified: roles/hub_ee_repository/meta/main.yml modified: roles/hub_ee_repository_sync/meta/main.yml modified: roles/hub_group/meta/main.yml modified: roles/hub_group_roles/meta/main.yml modified: roles/hub_namespace/meta/main.yml modified: roles/hub_publish/meta/main.yml modified: roles/hub_role/meta/main.yml modified: roles/hub_user/meta/main.yml modified: tests/templated_role_example/meta/main.yml --- CONVERSION_GUIDE.md | 7 ++++--- roles/eda_controller_tokens/meta/main.yml | 3 ++- roles/eda_credentials/meta/main.yml | 3 ++- roles/eda_decision_environments/meta/main.yml | 3 ++- roles/eda_projects/meta/main.yml | 3 ++- roles/eda_rulebook_activations/meta/main.yml | 3 ++- roles/eda_users/meta/main.yml | 3 ++- roles/gateway_applications/meta/main.yml | 3 ++- roles/gateway_authenticator_maps/meta/main.yml | 3 ++- roles/gateway_authenticators/meta/main.yml | 3 ++- roles/gateway_http_ports/meta/main.yml | 3 ++- roles/gateway_organizations/meta/main.yml | 3 ++- roles/gateway_role_user_assignments/meta/main.yml | 3 ++- roles/gateway_routes/meta/main.yml | 3 ++- roles/gateway_service_clusters/meta/main.yml | 3 ++- roles/gateway_service_keys/meta/main.yml | 3 ++- roles/gateway_service_nodes/meta/main.yml | 3 ++- roles/gateway_services/meta/main.yml | 3 ++- roles/gateway_settings/meta/main.yml | 3 ++- roles/gateway_teams/meta/main.yml | 3 ++- roles/gateway_users/meta/main.yml | 3 ++- roles/hub_collection/meta/main.yml | 3 ++- roles/hub_collection_remote/meta/main.yml | 3 ++- roles/hub_collection_repository/meta/main.yml | 3 ++- roles/hub_collection_repository_sync/meta/main.yml | 3 ++- roles/hub_ee_image/meta/main.yml | 3 ++- roles/hub_ee_registry/meta/main.yml | 3 ++- roles/hub_ee_registry_index/meta/main.yml | 3 ++- roles/hub_ee_registry_sync/meta/main.yml | 3 ++- roles/hub_ee_repository/meta/main.yml | 3 ++- roles/hub_ee_repository_sync/meta/main.yml | 3 ++- roles/hub_group/meta/main.yml | 3 ++- roles/hub_group_roles/meta/main.yml | 3 ++- roles/hub_namespace/meta/main.yml | 3 ++- roles/hub_publish/meta/main.yml | 3 ++- roles/hub_role/meta/main.yml | 3 ++- roles/hub_user/meta/main.yml | 3 ++- tests/templated_role_example/meta/main.yml | 3 ++- 38 files changed, 78 insertions(+), 40 deletions(-) diff --git a/CONVERSION_GUIDE.md b/CONVERSION_GUIDE.md index 81cf4d768..a98503e0f 100644 --- a/CONVERSION_GUIDE.md +++ b/CONVERSION_GUIDE.md @@ -11,7 +11,7 @@ infra.eda_configuration These have been combined along with new roles to configure the gateway aspect of AAP. -It is recomended to use the old collections when interacting with the Ansible Automation Platforms with versions 2.4 or prior. While some aspects of the collection may work, it can have unintended changes or behaviors. +It is recommended to use the old collections when interacting with the Ansible Automation Platforms with versions 2.4 or prior. While some aspects of the collection may work, it can have unintended changes or behaviors. The collections have been revamped to use a single set of connection variables and to standardize variables throughout the collections. This guide will go through some of the standard variables what they were before and what to change them to. @@ -31,7 +31,7 @@ These collections are required for this collection to work, While ansible.contro ## Connection and Global Variables -These are the variables that are used to connecto the platfrom and are the same accross all Roles. Various environment variables can be used as specfied by their module collections, but it is recomended to use ansible vars as they can be homogonized to be single variables. +These are the variables that are used to connect the platform and are the same across all Roles. Various environment variables can be used as specified by their module collections, but it is recommended to use ansible vars as they can be homogenized to be single variables. ### Connection Variables @@ -48,7 +48,7 @@ These are the connection variables, These are used to connect to the platform. ### Global Variables -Other Variables that will apply to all roles when used globally. Each of these has a per role that can override the default value if you wish to selectivly use them. This is useful for things like retries and delay on projects, or secure logging for a role. +Other Variables that will apply to all roles when used globally. Each of these has a per role that can override the default value if you wish to selectively use them. This is useful for things like retries and delay on projects, or secure logging for a role. |Variable Name|Default Value|Required|Description| |:---|:---:|:---:|:---|:---| @@ -118,6 +118,7 @@ controller_configuration vars: - controller_schedules - controller_launch_jobs - controller_workflow_launch_jobs +- aap_user_accounts <- controller_user_accounts eda_configuration vars: diff --git a/roles/eda_controller_tokens/meta/main.yml b/roles/eda_controller_tokens/meta/main.yml index 5412a6087..18529bd4e 100644 --- a/roles/eda_controller_tokens/meta/main.yml +++ b/roles/eda_controller_tokens/meta/main.yml @@ -34,7 +34,8 @@ galaxy_info: - "eda" - "configuration" -dependencies: [] +dependencies: + - role: global_vars # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. ... diff --git a/roles/eda_credentials/meta/main.yml b/roles/eda_credentials/meta/main.yml index 094b2300a..733a72264 100644 --- a/roles/eda_credentials/meta/main.yml +++ b/roles/eda_credentials/meta/main.yml @@ -36,7 +36,8 @@ galaxy_info: - "credential" - "credentials" -dependencies: [] +dependencies: + - role: global_vars # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. ... diff --git a/roles/eda_decision_environments/meta/main.yml b/roles/eda_decision_environments/meta/main.yml index 6dbb089d8..4f55a84e1 100644 --- a/roles/eda_decision_environments/meta/main.yml +++ b/roles/eda_decision_environments/meta/main.yml @@ -36,7 +36,8 @@ galaxy_info: - "decisionenvironment" - "decisionenvironments" -dependencies: [] +dependencies: + - role: global_vars # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. ... diff --git a/roles/eda_projects/meta/main.yml b/roles/eda_projects/meta/main.yml index 53945a740..165cf51e4 100644 --- a/roles/eda_projects/meta/main.yml +++ b/roles/eda_projects/meta/main.yml @@ -36,7 +36,8 @@ galaxy_info: - "project" - "projects" -dependencies: [] +dependencies: + - role: global_vars # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. ... diff --git a/roles/eda_rulebook_activations/meta/main.yml b/roles/eda_rulebook_activations/meta/main.yml index dd2127d5a..0e95566c4 100644 --- a/roles/eda_rulebook_activations/meta/main.yml +++ b/roles/eda_rulebook_activations/meta/main.yml @@ -38,7 +38,8 @@ galaxy_info: - "activation" - "activations" -dependencies: [] +dependencies: + - role: global_vars # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. ... diff --git a/roles/eda_users/meta/main.yml b/roles/eda_users/meta/main.yml index 5ed9c155c..e067fe30c 100644 --- a/roles/eda_users/meta/main.yml +++ b/roles/eda_users/meta/main.yml @@ -36,7 +36,8 @@ galaxy_info: - "user" - "users" -dependencies: [] +dependencies: + - role: global_vars # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. ... diff --git a/roles/gateway_applications/meta/main.yml b/roles/gateway_applications/meta/main.yml index 027706ab5..381a94358 100644 --- a/roles/gateway_applications/meta/main.yml +++ b/roles/gateway_applications/meta/main.yml @@ -24,5 +24,6 @@ galaxy_info: - application - applications -dependencies: [] +dependencies: + - role: global_vars ... diff --git a/roles/gateway_authenticator_maps/meta/main.yml b/roles/gateway_authenticator_maps/meta/main.yml index 3848e287a..5f5605c20 100644 --- a/roles/gateway_authenticator_maps/meta/main.yml +++ b/roles/gateway_authenticator_maps/meta/main.yml @@ -24,5 +24,6 @@ galaxy_info: - authenticatormap - authenticatormaps -dependencies: [] +dependencies: + - role: global_vars ... diff --git a/roles/gateway_authenticators/meta/main.yml b/roles/gateway_authenticators/meta/main.yml index ae56bc6b5..6796319c5 100644 --- a/roles/gateway_authenticators/meta/main.yml +++ b/roles/gateway_authenticators/meta/main.yml @@ -24,5 +24,6 @@ galaxy_info: - authenticator - authenticators -dependencies: [] +dependencies: + - role: global_vars ... diff --git a/roles/gateway_http_ports/meta/main.yml b/roles/gateway_http_ports/meta/main.yml index d8fabb15a..4fa9ac2e3 100644 --- a/roles/gateway_http_ports/meta/main.yml +++ b/roles/gateway_http_ports/meta/main.yml @@ -24,5 +24,6 @@ galaxy_info: - httpport - httpports -dependencies: [] +dependencies: + - role: global_vars ... diff --git a/roles/gateway_organizations/meta/main.yml b/roles/gateway_organizations/meta/main.yml index fbb5550f5..b41e9f20a 100644 --- a/roles/gateway_organizations/meta/main.yml +++ b/roles/gateway_organizations/meta/main.yml @@ -24,5 +24,6 @@ galaxy_info: - organization - organizations -dependencies: [] +dependencies: + - role: global_vars ... diff --git a/roles/gateway_role_user_assignments/meta/main.yml b/roles/gateway_role_user_assignments/meta/main.yml index b29634afa..a7f43bd8c 100644 --- a/roles/gateway_role_user_assignments/meta/main.yml +++ b/roles/gateway_role_user_assignments/meta/main.yml @@ -24,5 +24,6 @@ galaxy_info: - roleuserassignment - roleuserassignments -dependencies: [] +dependencies: + - role: global_vars ... diff --git a/roles/gateway_routes/meta/main.yml b/roles/gateway_routes/meta/main.yml index 65086f31e..638654423 100644 --- a/roles/gateway_routes/meta/main.yml +++ b/roles/gateway_routes/meta/main.yml @@ -24,5 +24,6 @@ galaxy_info: - route - routes -dependencies: [] +dependencies: + - role: global_vars ... diff --git a/roles/gateway_service_clusters/meta/main.yml b/roles/gateway_service_clusters/meta/main.yml index 505b755b6..15562cad6 100644 --- a/roles/gateway_service_clusters/meta/main.yml +++ b/roles/gateway_service_clusters/meta/main.yml @@ -24,5 +24,6 @@ galaxy_info: - servicecluster - serviceclusters -dependencies: [] +dependencies: + - role: global_vars ... diff --git a/roles/gateway_service_keys/meta/main.yml b/roles/gateway_service_keys/meta/main.yml index 378cb6926..ea15a2b0a 100644 --- a/roles/gateway_service_keys/meta/main.yml +++ b/roles/gateway_service_keys/meta/main.yml @@ -24,5 +24,6 @@ galaxy_info: - servicekey - servicekeys -dependencies: [] +dependencies: + - role: global_vars ... diff --git a/roles/gateway_service_nodes/meta/main.yml b/roles/gateway_service_nodes/meta/main.yml index dc06538ab..cbb553ac9 100644 --- a/roles/gateway_service_nodes/meta/main.yml +++ b/roles/gateway_service_nodes/meta/main.yml @@ -24,5 +24,6 @@ galaxy_info: - servicenode - servicenodes -dependencies: [] +dependencies: + - role: global_vars ... diff --git a/roles/gateway_services/meta/main.yml b/roles/gateway_services/meta/main.yml index a0e43feb9..d18884cc4 100644 --- a/roles/gateway_services/meta/main.yml +++ b/roles/gateway_services/meta/main.yml @@ -24,5 +24,6 @@ galaxy_info: - service - services -dependencies: [] +dependencies: + - role: global_vars ... diff --git a/roles/gateway_settings/meta/main.yml b/roles/gateway_settings/meta/main.yml index 07bfefa08..417ee4351 100644 --- a/roles/gateway_settings/meta/main.yml +++ b/roles/gateway_settings/meta/main.yml @@ -21,5 +21,6 @@ galaxy_info: - setting - settings -dependencies: [] +dependencies: + - role: global_vars ... diff --git a/roles/gateway_teams/meta/main.yml b/roles/gateway_teams/meta/main.yml index fdca9958b..100ed583f 100644 --- a/roles/gateway_teams/meta/main.yml +++ b/roles/gateway_teams/meta/main.yml @@ -24,5 +24,6 @@ galaxy_info: - team - teams -dependencies: [] +dependencies: + - role: global_vars ... diff --git a/roles/gateway_users/meta/main.yml b/roles/gateway_users/meta/main.yml index 3f5496f9e..c380c437b 100644 --- a/roles/gateway_users/meta/main.yml +++ b/roles/gateway_users/meta/main.yml @@ -24,5 +24,6 @@ galaxy_info: - user - users -dependencies: [] +dependencies: + - role: global_vars ... diff --git a/roles/hub_collection/meta/main.yml b/roles/hub_collection/meta/main.yml index fe182e596..64a7a62fe 100644 --- a/roles/hub_collection/meta/main.yml +++ b/roles/hub_collection/meta/main.yml @@ -36,7 +36,8 @@ galaxy_info: - "collection" - "sync" -dependencies: [] +dependencies: + - role: global_vars # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. ... diff --git a/roles/hub_collection_remote/meta/main.yml b/roles/hub_collection_remote/meta/main.yml index f9d5ace1f..247ce0c6a 100644 --- a/roles/hub_collection_remote/meta/main.yml +++ b/roles/hub_collection_remote/meta/main.yml @@ -35,7 +35,8 @@ galaxy_info: - "configuration" - "remote" -dependencies: [] +dependencies: + - role: global_vars # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. ... diff --git a/roles/hub_collection_repository/meta/main.yml b/roles/hub_collection_repository/meta/main.yml index 971cc748b..67010afb3 100644 --- a/roles/hub_collection_repository/meta/main.yml +++ b/roles/hub_collection_repository/meta/main.yml @@ -35,7 +35,8 @@ galaxy_info: - "configuration" - "repository" -dependencies: [] +dependencies: + - role: global_vars # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. ... diff --git a/roles/hub_collection_repository_sync/meta/main.yml b/roles/hub_collection_repository_sync/meta/main.yml index f744f2024..7cde4abd1 100644 --- a/roles/hub_collection_repository_sync/meta/main.yml +++ b/roles/hub_collection_repository_sync/meta/main.yml @@ -35,7 +35,8 @@ galaxy_info: - "configuration" - "repository" -dependencies: [] +dependencies: + - role: global_vars # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. ... diff --git a/roles/hub_ee_image/meta/main.yml b/roles/hub_ee_image/meta/main.yml index dcf8d1e16..fed9d7b5b 100644 --- a/roles/hub_ee_image/meta/main.yml +++ b/roles/hub_ee_image/meta/main.yml @@ -36,7 +36,8 @@ galaxy_info: - "ee" - "image" -dependencies: [] +dependencies: + - role: global_vars # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. ... diff --git a/roles/hub_ee_registry/meta/main.yml b/roles/hub_ee_registry/meta/main.yml index eb7961f07..b1c5c5c62 100644 --- a/roles/hub_ee_registry/meta/main.yml +++ b/roles/hub_ee_registry/meta/main.yml @@ -36,7 +36,8 @@ galaxy_info: - "ee" - "registry" -dependencies: [] +dependencies: + - role: global_vars # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. ... diff --git a/roles/hub_ee_registry_index/meta/main.yml b/roles/hub_ee_registry_index/meta/main.yml index 200f47e39..74b51657b 100644 --- a/roles/hub_ee_registry_index/meta/main.yml +++ b/roles/hub_ee_registry_index/meta/main.yml @@ -37,7 +37,8 @@ galaxy_info: - "registry" - "index" -dependencies: [] +dependencies: + - role: global_vars # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. ... diff --git a/roles/hub_ee_registry_sync/meta/main.yml b/roles/hub_ee_registry_sync/meta/main.yml index 58bf8f783..5be6c8ead 100644 --- a/roles/hub_ee_registry_sync/meta/main.yml +++ b/roles/hub_ee_registry_sync/meta/main.yml @@ -37,7 +37,8 @@ galaxy_info: - "registry" - "sync" -dependencies: [] +dependencies: + - role: global_vars # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. ... diff --git a/roles/hub_ee_repository/meta/main.yml b/roles/hub_ee_repository/meta/main.yml index 634325e7b..eecfd46d4 100644 --- a/roles/hub_ee_repository/meta/main.yml +++ b/roles/hub_ee_repository/meta/main.yml @@ -36,7 +36,8 @@ galaxy_info: - "ee" - "repository" -dependencies: [] +dependencies: + - role: global_vars # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. ... diff --git a/roles/hub_ee_repository_sync/meta/main.yml b/roles/hub_ee_repository_sync/meta/main.yml index aba6e18ea..098fe9fcc 100644 --- a/roles/hub_ee_repository_sync/meta/main.yml +++ b/roles/hub_ee_repository_sync/meta/main.yml @@ -37,7 +37,8 @@ galaxy_info: - "repository" - "sync" -dependencies: [] +dependencies: + - role: global_vars # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. ... diff --git a/roles/hub_group/meta/main.yml b/roles/hub_group/meta/main.yml index ce0154768..6d2d36ca1 100644 --- a/roles/hub_group/meta/main.yml +++ b/roles/hub_group/meta/main.yml @@ -36,7 +36,8 @@ galaxy_info: - "group" - "groups" -dependencies: [] +dependencies: + - role: global_vars # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. ... diff --git a/roles/hub_group_roles/meta/main.yml b/roles/hub_group_roles/meta/main.yml index d67ff4b58..4f7c272ed 100644 --- a/roles/hub_group_roles/meta/main.yml +++ b/roles/hub_group_roles/meta/main.yml @@ -38,7 +38,8 @@ galaxy_info: - "role" - "roles" -dependencies: [] +dependencies: + - role: global_vars # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. ... diff --git a/roles/hub_namespace/meta/main.yml b/roles/hub_namespace/meta/main.yml index 495f06e7d..00b9a58c9 100644 --- a/roles/hub_namespace/meta/main.yml +++ b/roles/hub_namespace/meta/main.yml @@ -36,7 +36,8 @@ galaxy_info: - "namespace" - "namespaces" -dependencies: [] +dependencies: + - role: global_vars # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. ... diff --git a/roles/hub_publish/meta/main.yml b/roles/hub_publish/meta/main.yml index e6a6993b4..db83a0f69 100644 --- a/roles/hub_publish/meta/main.yml +++ b/roles/hub_publish/meta/main.yml @@ -37,7 +37,8 @@ galaxy_info: - "collections" - "publish" -dependencies: [] +dependencies: + - role: global_vars # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. ... diff --git a/roles/hub_role/meta/main.yml b/roles/hub_role/meta/main.yml index a0ca2539e..66e758adc 100644 --- a/roles/hub_role/meta/main.yml +++ b/roles/hub_role/meta/main.yml @@ -36,7 +36,8 @@ galaxy_info: - "role" - "roles" -dependencies: [] +dependencies: + - role: global_vars # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. ... diff --git a/roles/hub_user/meta/main.yml b/roles/hub_user/meta/main.yml index b00555fbe..087273402 100644 --- a/roles/hub_user/meta/main.yml +++ b/roles/hub_user/meta/main.yml @@ -36,7 +36,8 @@ galaxy_info: - "user" - "users" -dependencies: [] +dependencies: + - role: global_vars # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. ... diff --git a/tests/templated_role_example/meta/main.yml b/tests/templated_role_example/meta/main.yml index f2f7171ad..793efcdc2 100644 --- a/tests/templated_role_example/meta/main.yml +++ b/tests/templated_role_example/meta/main.yml @@ -40,7 +40,8 @@ collections: - ansible.controller - awx.awx -dependencies: [] +dependencies: + - role: global_vars # List your role dependencies here, one per line. Be sure to remove the '[]' above, # if you add dependencies to this list. ...