Merge pull request #61 from djdanielsson/update

updating to the new 3.1 aap_configuration collection

README.md

@@ -41,7 +41,7 @@ The awx.awx or ansible.controller collections MUST be installed in order for thi
   hosts: localhost
   connection: local
   vars:
-    controller_validate_certs: false
+    aap_validate_certs: false
   collections:
     - awx.awx
 ```

group_vars/all/applications.yml

@@ -1,5 +1,5 @@
 ---
-controller_applications_all:
+aap_applications_all:
   - name: config_as_code_api
     description: launch controller config job template
     organization: config_as_code

group_vars/all/auth.yml

@@ -1,23 +1,7 @@
 # User may add controller auth creds to this file and encrypt it using `ansible-vault`
 ---
-controller_hostname: "{{ controller_host | default(groups['automationcontroller'][0]) }}:{{ controller_port | default(443) }}"
-controller_username: "{{ controller_user | default('admin') }}"
-controller_password: "{{ controller_pass }}"
-controller_validate_certs: false
-
-ah_host: "{{ ah_hostname | default(groups['automationhub'][0]) }}:{{ ah_port | default(443) }}"
-ah_username: "{{ ah_user | default('admin') }}"
-ah_password: "{{ ah_pass }}"
-ah_path_prefix: 'galaxy' # this is for private automation hub
-ah_verify_ssl: false
-ah_validate_certs: false
-
-ee_registry_username: "{{ ah_username }}"
-ee_registry_password: "{{ ah_password }}"
-ee_registry_dest: "{{ ah_host }}"
-
-eda_hostname: "{{ eda_host | default(groups['automationedacontroller'][0]) | default(groups['automationeda'][0]) }}:{{ eda_port | default(443) }}"
-eda_username: "{{ eda_user | default('admin') }}"
-eda_password: "{{ eda_pass }}"
-eda_validate_certs: false
+aap_hostname: "{{ aap_host | default(groups['automationcontroller'][0]) }}:{{ controller_port | default(443) }}"
+aap_username: "{{ aap_user | default('admin') }}"
+aap_password: "{{ aap_pass }}"
+aap_validate_certs: false
 ...

group_vars/all/credential_types.yml

@@ -26,17 +26,17 @@ controller_credential_types_all:
         - hostname
     injectors:
       env:
-        AH_PASSWORD: !unsafe "{{ password }}"
-        AH_USERNAME: !unsafe "{{ username }}"
-        AH_HOST: !unsafe "{{ hostname }}"
+        aap_password: !unsafe "{{ password }}"
+        aap_username: !unsafe "{{ username }}"
+        aap_hostname: !unsafe "{{ hostname }}"
         AH_API_TOKEN: !unsafe "{{ token }}"
         AH_VERIFY_SSL: !unsafe "{{ verify_ssl }}"
       extra_vars:
-        ah_password: !unsafe "{{ password }}"
-        ah_username: !unsafe "{{ username }}"
-        ah_host: !unsafe "{{ hostname }}"
-        ah_token: !unsafe "{{ token }}"
-        ah_validate_certs: !unsafe "{{ verify_ssl }}"
+        aap_password: !unsafe "{{ password }}"
+        aap_username: !unsafe "{{ username }}"
+        aap_hostname: !unsafe "{{ hostname }}"
+        aap_token: !unsafe "{{ token }}"
+        aap_validate_certs: !unsafe "{{ verify_ssl }}"
 
   - name: ssh_priv_file
     kind: cloud

group_vars/all/credentials.yml

@@ -5,66 +5,66 @@ controller_credentials_all:
     organization: config_as_code
     description: aap admin account
     inputs:
-      host: "{{ controller_hostname }}"
-      username: "{{ controller_username }}"
-      password: "{{ controller_password }}"
+      host: "{{ aap_hostname }}"
+      username: "{{ aap_username }}"
+      password: "{{ aap_password }}"
       verify_ssl: false
 
   - name: ah_admin_user_pass
     credential_type: automation_hub
     organization: config_as_code
     description: automation hub admin account
     inputs:
-      hostname: "{{ ah_host }}"
-      username: "{{ ah_username }}"
-      password: "{{ ah_password }}"
+      hostname: "{{ aap_hostname }}"
+      username: "{{ aap_username }}"
+      password: "{{ aap_password }}"
       verify_ssl: false
 
   - name: ah_token_user
     credential_type: automation_hub
     organization: config_as_code
     description: automation hub api account
     inputs:
-      hostname: "{{ ah_host }}"
+      hostname: "{{ aap_hostname }}"
       username: "{{ ah_token_username }}"
-      token: "{{ ah_token }}"
+      token: "{{ aap_token }}"
       verify_ssl: false
 
   - name: ah_certified
     credential_type: Ansible Galaxy/Automation Hub API Token
     organization: config_as_code
     inputs:
-      url: https://{{ ah_host }}/api/galaxy/content/rh-certified/
-      token: "{{ ah_token }}"
+      url: https://{{ aap_hostname }}/pulp_ansible/galaxy/rh-certified/
+      token: "{{ aap_token }}"
 
   - name: ah_published
     credential_type: Ansible Galaxy/Automation Hub API Token
     organization: config_as_code
     inputs:
-      url: https://{{ ah_host }}/api/galaxy/content/published/
-      token: "{{ ah_token }}"
+      url: https://{{ aap_hostname }}/pulp_ansible/galaxy/published/
+      token: "{{ aap_token }}"
 
   - name: ah_validated
     credential_type: Ansible Galaxy/Automation Hub API Token
     organization: config_as_code
     inputs:
-      url: https://{{ ah_host }}/api/galaxy/content/validated/
-      token: "{{ ah_token }}"
+      url: https://{{ aap_hostname }}/pulp_ansible/galaxy/validated/
+      token: "{{ aap_token }}"
 
   - name: ah_community
     credential_type: Ansible Galaxy/Automation Hub API Token
     organization: config_as_code
     inputs:
-      url: https://{{ ah_host }}/api/galaxy/content/community/
-      token: "{{ ah_token }}"
+      url: https://{{ aap_hostname }}/pulp_ansible/galaxy/community/
+      token: "{{ aap_token }}"
 
   - name: cr_ah
     credential_type: Container Registry
     organization: config_as_code
     inputs:
-      host: "{{ ah_host }}"
-      username: "{{ ah_username }}"
-      password: "{{ ah_password }}"
+      host: "{{ aap_hostname }}"
+      username: "{{ aap_username }}"
+      password: "{{ aap_password }}"
       verify_ssl: false
 
   - name: root

group_vars/all/eda_credentials.yml

@@ -3,6 +3,6 @@ eda_credentials:
   - name: hub
     description:  private automation hub
     credential_type: 'Container Registry'
-    username: "{{ ah_username }}"
-    secret: "{{ ah_password }}"
+    username: "{{ aap_username }}"
+    secret: "{{ aap_password }}"
 ...

group_vars/all/eda_decision_environments.yml

@@ -2,6 +2,6 @@
 eda_decision_environments:
   - name: minimal
     description: my default decision environment
-    image_url: "{{ ah_host }}/de-minimal-rhel8"
+    image_url: "{{ aap_hostname }}/de-minimal-rhel8"
     credential: hub
 ...

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/execution_environments.yml

@@ -1,17 +1,17 @@
 ---
 controller_execution_environments_all:
   - name: supported
-    image: "{{ ah_host }}/ee-supported-rhel8"
+    image: "{{ aap_hostname }}/ee-supported-rhel8"
     pull: always
     credential: cr_ah
 
   - name: minimal
-    image: "{{ ah_host }}/ee-minimal-rhel8"
+    image: "{{ aap_hostname }}/ee-minimal-rhel8"
     pull: always
     credential: cr_ah
 
   - name: old_29_ee
-    image: "{{ ah_host }}/ee-29-rhel8"
+    image: "{{ aap_hostname }}/ee-29-rhel8"
     pull: always
     credential: cr_ah
 ...

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_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/organizations.yml

@@ -1,5 +1,5 @@
 ---
-controller_organizations_all:
+aap_organizations_all:
   - name: config_as_code
     galaxy_credentials:
       - ah_published

group_vars/all/teams.yml

@@ -1,5 +1,7 @@
 ---
-controller_teams_all:
+aap_teams_all:
   - name: config_as_code_admin
     organization: config_as_code
+  - name: admin
+    state: present
 ...

group_vars/all/users.yml

@@ -1,6 +1,15 @@
 ---
-controller_user_accounts_all:
-  - user: api_user
+ah_token_username: token_user
+aap_user_accounts_all:
+  - 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
 ...

group_vars/dev/applications.yml

@@ -1,3 +1,3 @@
 ---
-controller_applications_dev: []
+aap_applications_dev: []
 ...

group_vars/dev/main.yml

@@ -1,5 +1,5 @@
 ---
-controller_applications: "{{ controller_applications_all + controller_applications_dev }}"
+aap_applications: "{{ aap_applications_all + aap_applications_dev }}"
 controller_credential_input_sources: "{{ controller_credential_input_sources_all + controller_credential_input_sources_dev }}"
 controller_credential_types: "{{ controller_credential_types_all + controller_credential_types_dev }}"
 controller_credentials: "{{ controller_credentials_all + controller_credentials_dev }}"
@@ -12,13 +12,13 @@ controller_inventory_sources: "{{ controller_inventory_sources_all + controller_
 controller_templates: "{{ controller_templates_all + controller_templates_dev }}"
 controller_labels: "{{ controller_labels_all + controller_labels_dev }}"
 controller_notifications: "{{ controller_notifications_all + controller_notifications_dev }}"
-controller_organizations: "{{ controller_organizations_all + controller_organizations_dev }}"
+aap_organizations: "{{ aap_organizations_all + aap_organizations_dev }}"
 controller_projects: "{{ controller_projects_all + controller_projects_dev }}"
 controller_roles: "{{ controller_roles_all + controller_roles_dev }}"
 controller_schedules: "{{ controller_schedules_all + controller_schedules_dev }}"
 controller_settings: "{{ controller_settings_all | combine(controller_settings_dev, list_merge='append', recursive=true) }}"
-controller_teams: "{{ controller_teams_all + controller_teams_dev }}"
-controller_user_accounts: "{{ controller_user_accounts_all + controller_user_accounts_dev }}"
+aap_teams: "{{ aap_teams_all + aap_teams_dev }}"
+aap_user_accounts: "{{ aap_user_accounts_all + aap_user_accounts_dev }}"
 controller_workflows: "{{ controller_workflows_all + controller_workflows_dev }}"
 env: dev
 scm_branch: "" # when you want it to be default branch just set to ""

group_vars/dev/organizations.yml

@@ -1,3 +1,3 @@
 ---
-controller_organizations_dev: []
+aap_organizations_dev: []
 ...

group_vars/dev/teams.yml

@@ -1,3 +1,3 @@
 ---
-controller_teams_dev: []
+aap_teams_dev: []
 ...

group_vars/dev/users.yml

@@ -1,3 +1,3 @@
 ---
-controller_user_accounts_dev: []
+aap_user_accounts_dev: []
 ...