modified: CONVERSION_GUIDE.md (#948)

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

@@ -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:
 

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.
 ...

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.
 ...

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.
 ...

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.
 ...

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.
 ...

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.
 ...

roles/gateway_applications/meta/main.yml

@@ -24,5 +24,6 @@ galaxy_info:
     - application
     - applications
 
-dependencies: []
+dependencies:
+  - role: global_vars
 ...

roles/gateway_authenticator_maps/meta/main.yml

@@ -24,5 +24,6 @@ galaxy_info:
     - authenticatormap
     - authenticatormaps
 
-dependencies: []
+dependencies:
+  - role: global_vars
 ...

roles/gateway_authenticators/meta/main.yml

@@ -24,5 +24,6 @@ galaxy_info:
     - authenticator
     - authenticators
 
-dependencies: []
+dependencies:
+  - role: global_vars
 ...

roles/gateway_http_ports/meta/main.yml

@@ -24,5 +24,6 @@ galaxy_info:
     - httpport
     - httpports
 
-dependencies: []
+dependencies:
+  - role: global_vars
 ...

roles/gateway_organizations/meta/main.yml

@@ -24,5 +24,6 @@ galaxy_info:
     - organization
     - organizations
 
-dependencies: []
+dependencies:
+  - role: global_vars
 ...

roles/gateway_role_user_assignments/meta/main.yml

@@ -24,5 +24,6 @@ galaxy_info:
     - roleuserassignment
     - roleuserassignments
 
-dependencies: []
+dependencies:
+  - role: global_vars
 ...

roles/gateway_routes/meta/main.yml

@@ -24,5 +24,6 @@ galaxy_info:
     - route
     - routes
 
-dependencies: []
+dependencies:
+  - role: global_vars
 ...

roles/gateway_service_clusters/meta/main.yml

@@ -24,5 +24,6 @@ galaxy_info:
     - servicecluster
     - serviceclusters
 
-dependencies: []
+dependencies:
+  - role: global_vars
 ...

roles/gateway_service_keys/meta/main.yml

@@ -24,5 +24,6 @@ galaxy_info:
     - servicekey
     - servicekeys
 
-dependencies: []
+dependencies:
+  - role: global_vars
 ...

roles/gateway_service_nodes/meta/main.yml

@@ -24,5 +24,6 @@ galaxy_info:
     - servicenode
     - servicenodes
 
-dependencies: []
+dependencies:
+  - role: global_vars
 ...

roles/gateway_services/meta/main.yml

@@ -24,5 +24,6 @@ galaxy_info:
     - service
     - services
 
-dependencies: []
+dependencies:
+  - role: global_vars
 ...

roles/gateway_settings/meta/main.yml

@@ -21,5 +21,6 @@ galaxy_info:
     - setting
     - settings
 
-dependencies: []
+dependencies:
+  - role: global_vars
 ...

roles/gateway_teams/meta/main.yml

@@ -24,5 +24,6 @@ galaxy_info:
     - team
     - teams
 
-dependencies: []
+dependencies:
+  - role: global_vars
 ...

roles/gateway_users/meta/main.yml

@@ -24,5 +24,6 @@ galaxy_info:
     - user
     - users
 
-dependencies: []
+dependencies:
+  - role: global_vars
 ...

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.
 ...

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.
 ...

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.
 ...

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.
 ...

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.
 ...

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.
 ...

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.
 ...

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.
 ...

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.
 ...

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.
 ...

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.
 ...

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.
 ...

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.
 ...

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.
 ...

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.
 ...

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.
 ...

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.
 ...