deleted: group_vars/all/ah_ee_main.yml

	deleted:    group_vars/all/ah_ee_namespaces.yml
	deleted:    group_vars/all/ah_users.yml
	renamed:    group_vars/all/ah_ee_list.yml -> group_vars/all/ee_list.yml
	renamed:    group_vars/all/ah_collection_namespaces.yml -> group_vars/all/hub_collection_namespaces.yml
	renamed:    group_vars/all/ah_collection_publish.yml -> group_vars/all/hub_collection_publish.yml
	renamed:    group_vars/all/ah_ee_images.yml -> group_vars/all/hub_ee_images.yml
	renamed:    group_vars/all/ah_ee_registries.yml -> group_vars/all/hub_ee_registries.yml
	renamed:    group_vars/all/ah_ee_repositories.yml -> group_vars/all/hub_ee_repositories.yml
	renamed:    group_vars/all/ah_group_roles.yml -> group_vars/all/hub_group_roles.yml
	renamed:    group_vars/all/ah_groups.yml -> group_vars/all/hub_groups.yml
	renamed:    group_vars/all/ah_repositories.yml -> group_vars/all/hub_repositories.yml
	modified:   group_vars/all/users.yml
	modified:   playbooks/hub_config.yml

group_vars/all/ah_ee_list.yml → group_vars/all/ee_list.yml

@@ -1,4 +1,14 @@
 ---
+# ee_base_image: registry.redhat.io/ansible-automation-platform-22/ee-supported-rhel8
+# ee_builder_image: registry.redhat.io/ansible-automation-platform-22/ansible-builder-rhel8
+ee_image_push: true
+ee_validate_certs: false
+ee_create_ansible_config: false
+# ee_auth_file:
+# ee_executable:
+# ee_ca_cert_dir:
+# ee_sign_by:
+
 ee_list:
   - name: config_as_code_ee
     dependencies:

group_vars/all/ah_collection_namespaces.yml → group_vars/all/hub_collection_namespaces.yml

@@ -1,5 +1,5 @@
 ---
-ah_namespaces:
+hub_namespaces:
   - name: community_test
     company: Ansible by Red Hat
     email: [email protected]

group_vars/all/ah_collection_publish.yml → group_vars/all/hub_collection_publish.yml

@@ -1,6 +1,6 @@
 ---
 ah_auto_approve: true
-ah_collections:
+hub_collections:
   - collection_name: test
     git_url: https://github.com/sean-m-sullivan/collection_test.git
     # key_path: "{{ lookup('env', 'MY_CERT_FILE') }}"

group_vars/all/ah_ee_images.yml → group_vars/all/hub_ee_images.yml

@@ -1,7 +1,7 @@
 ---
 # Documentation:
 # https://github.com/ansible/galaxy_collection/blob/devel/roles/ee_image/README.md
-ah_ee_images: []
+hub_ee_images: []
 #   - name:
 #     state: "{{ target_state }}"
 #     append: false

group_vars/all/ah_ee_registries.yml → group_vars/all/hub_ee_registries.yml

@@ -3,7 +3,7 @@
 # - https://github.com/ansible/galaxy_collection/blob/devel/roles/ee_registry/README.md
 # - https://github.com/ansible/galaxy_collection/blob/devel/roles/ee_registry_index/README.md
 # - https://github.com/ansible/galaxy_collection/blob/devel/roles/ee_registry_sync/README.md
-ah_ee_registries: []
+hub_ee_registries: []
 #   - name: registry_redhat_io
 #     url: https://registry.redhat.io
 #     username: "{{ rh_username }}"

group_vars/all/ah_ee_repositories.yml → group_vars/all/hub_ee_repositories.yml

@@ -1,7 +1,7 @@
 ---
 # Documentation:
 # https://github.com/ansible/galaxy_collection/tree/devel/roles/ee_repository
-ah_ee_repositories: []
+hub_ee_repositories: []
 #   - name: ansible-automation-platform/ee-minimal-rhel8
 #     readme: ""  # mutex with readme_file
 #     readme_file: ""  # mutex with readme

group_vars/all/ah_group_roles.yml → group_vars/all/hub_group_roles.yml

@@ -1,6 +1,6 @@
 ---
 # Documentation: https://github.com/ansible/galaxy_collection/blob/devel/roles/group_roles/README.md
-ah_group_roles: []
+hub_group_roles: []
   # - state: present
   #   groups:
   #     - foo

group_vars/all/ah_groups.yml → group_vars/all/hub_groups.yml

@@ -1,7 +1,7 @@
 ---
 # Role permissions using the 'perms' option is deprecated and will be removed
 # in galaxy_collection 3.0.0.Instead, set the group's roles in
-# groups_vars/all/ah_group_roles.yml
+# groups_vars/all/hub_group_roles.yml
 aap_teams:
   - name: admin
     state: present

group_vars/all/ah_repositories.yml → group_vars/all/hub_repositories.yml

@@ -1,5 +1,5 @@
 ---
-ah_collection_remotes:
+hub_collection_remotes:
   - name: rh-certified
     token: "{{ cloud_token }}"
     url: https://console.redhat.com/api/automation-hub/content/published/
@@ -23,7 +23,7 @@ ah_collection_remotes:
       - community.crypto
       - cloud.terraform
 
-ah_collection_repositories:
+hub_collection_repositories:
   - name: rh-certified
     remote: rh-certified
   - name: validated

group_vars/all/users.yml

@@ -1,6 +1,15 @@
 ---
+ah_token_username: token_user
 aap_user_accounts_all:
-  - user: api_user
+  - username: api_user
     is_superuser: false
     password: "{{ controller_api_user_pass }}"
+  - username: token_user
+    # Currently not working
+    # groups:
+    #   - "admin"
+    append: true
+    is_superuser: true
+    password: "{{ ah_token_password }}"
+    state: present
 ...

playbooks/hub_config.yml

@@ -37,32 +37,32 @@
     - name: Include ee_registry role
       ansible.builtin.include_role:
         name: infra.ah_configuration.ee_registry
-      when: ah_ee_registries | length is not match('0')
+      when: hub_ee_registries | length is not match('0')
 
     - name: Include ee_registry_index role
       ansible.builtin.include_role:
         name: infra.ah_configuration.ee_registry_index
-      when: ah_ee_registries | length is not match('0')
+      when: hub_ee_registries | length is not match('0')
 
     - name: Include ee_registry_sync role
       ansible.builtin.include_role:
         name: infra.ah_configuration.ee_registry_sync
-      when: ah_ee_registries | length is not match('0')
+      when: hub_ee_registries | length is not match('0')
 
     - name: Include ee_repository role
       ansible.builtin.include_role:
         name: infra.ah_configuration.ee_repository
-      when: ah_ee_repositories | length is not match('0')
+      when: hub_ee_repositories | length is not match('0')
 
     - name: Include ee_repository_sync role
       ansible.builtin.include_role:
         name: infra.ah_configuration.ee_repository_sync
-      when: ah_ee_repositories | length is not match('0')
+      when: hub_ee_repositories | length is not match('0')
 
     - name: Include ee_image role
       ansible.builtin.include_role:
         name: infra.ah_configuration.ee_image
-      when: ah_ee_images | length is not match('0')
+      when: hub_ee_images | length is not match('0')
 
     - name: Include group role
       ansible.builtin.include_role:
@@ -72,7 +72,7 @@
     - name: Include group_roles role
       ansible.builtin.include_role:
         name: infra.ah_configuration.group_roles
-      when: ah_group_roles | length is not match('0')
+      when: hub_group_roles | length is not match('0')
 
     - name: Include user role
       ansible.builtin.include_role: