From 4b228ef023dd1ec6fa6b207588e1133840623c45 Mon Sep 17 00:00:00 2001 From: David Danielsson Date: Mon, 11 Nov 2024 15:27:11 -0600 Subject: [PATCH] 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_main.yml | 11 ----------- group_vars/all/ah_ee_namespaces.yml | 9 --------- group_vars/all/ah_users.yml | 12 ------------ group_vars/all/{ah_ee_list.yml => ee_list.yml} | 10 ++++++++++ ...amespaces.yml => hub_collection_namespaces.yml} | 2 +- ...tion_publish.yml => hub_collection_publish.yml} | 2 +- .../all/{ah_ee_images.yml => hub_ee_images.yml} | 2 +- ...{ah_ee_registries.yml => hub_ee_registries.yml} | 2 +- ...ee_repositories.yml => hub_ee_repositories.yml} | 2 +- .../{ah_group_roles.yml => hub_group_roles.yml} | 2 +- group_vars/all/{ah_groups.yml => hub_groups.yml} | 2 +- .../{ah_repositories.yml => hub_repositories.yml} | 4 ++-- group_vars/all/users.yml | 11 ++++++++++- playbooks/hub_config.yml | 14 +++++++------- 14 files changed, 36 insertions(+), 49 deletions(-) delete mode 100644 group_vars/all/ah_ee_main.yml delete mode 100644 group_vars/all/ah_ee_namespaces.yml delete mode 100644 group_vars/all/ah_users.yml rename group_vars/all/{ah_ee_list.yml => ee_list.yml} (57%) rename group_vars/all/{ah_collection_namespaces.yml => hub_collection_namespaces.yml} (96%) rename group_vars/all/{ah_collection_publish.yml => hub_collection_publish.yml} (92%) rename group_vars/all/{ah_ee_images.yml => hub_ee_images.yml} (92%) rename group_vars/all/{ah_ee_registries.yml => hub_ee_registries.yml} (96%) rename group_vars/all/{ah_ee_repositories.yml => hub_ee_repositories.yml} (96%) rename group_vars/all/{ah_group_roles.yml => hub_group_roles.yml} (94%) rename group_vars/all/{ah_groups.yml => hub_groups.yml} (83%) rename group_vars/all/{ah_repositories.yml => hub_repositories.yml} (94%) diff --git a/group_vars/all/ah_ee_main.yml b/group_vars/all/ah_ee_main.yml deleted file mode 100644 index 3c57ae2..0000000 --- a/group_vars/all/ah_ee_main.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# 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: -... diff --git a/group_vars/all/ah_ee_namespaces.yml b/group_vars/all/ah_ee_namespaces.yml deleted file mode 100644 index 410d3e6..0000000 --- a/group_vars/all/ah_ee_namespaces.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -ah_ee_namespaces: [] -# - name: -# append: -# groups: -# - -# - -# state: "{{ target_state }}" -... diff --git a/group_vars/all/ah_users.yml b/group_vars/all/ah_users.yml deleted file mode 100644 index 1421226..0000000 --- a/group_vars/all/ah_users.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -ah_token_username: token_user -aap_user_accounts: - - username: token_user - # Currently not working - # groups: - # - "admin" - append: true - is_superuser: true - password: "{{ ah_token_password }}" - state: present -... diff --git a/group_vars/all/ah_ee_list.yml b/group_vars/all/ee_list.yml similarity index 57% rename from group_vars/all/ah_ee_list.yml rename to group_vars/all/ee_list.yml index d8c6ba1..2a2119b 100644 --- a/group_vars/all/ah_ee_list.yml +++ b/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: diff --git a/group_vars/all/ah_collection_namespaces.yml b/group_vars/all/hub_collection_namespaces.yml similarity index 96% rename from group_vars/all/ah_collection_namespaces.yml rename to group_vars/all/hub_collection_namespaces.yml index b84e646..2f82e96 100644 --- a/group_vars/all/ah_collection_namespaces.yml +++ b/group_vars/all/hub_collection_namespaces.yml @@ -1,5 +1,5 @@ --- -ah_namespaces: +hub_namespaces: - name: community_test company: Ansible by Red Hat email: ddaniels@redhat.com diff --git a/group_vars/all/ah_collection_publish.yml b/group_vars/all/hub_collection_publish.yml similarity index 92% rename from group_vars/all/ah_collection_publish.yml rename to group_vars/all/hub_collection_publish.yml index 8255e30..47eff9a 100644 --- a/group_vars/all/ah_collection_publish.yml +++ b/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') }}" diff --git a/group_vars/all/ah_ee_images.yml b/group_vars/all/hub_ee_images.yml similarity index 92% rename from group_vars/all/ah_ee_images.yml rename to group_vars/all/hub_ee_images.yml index 6d43304..41ddc1a 100644 --- a/group_vars/all/ah_ee_images.yml +++ b/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 diff --git a/group_vars/all/ah_ee_registries.yml b/group_vars/all/hub_ee_registries.yml similarity index 96% rename from group_vars/all/ah_ee_registries.yml rename to group_vars/all/hub_ee_registries.yml index 7053ca2..c4b17d8 100644 --- a/group_vars/all/ah_ee_registries.yml +++ b/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 }}" diff --git a/group_vars/all/ah_ee_repositories.yml b/group_vars/all/hub_ee_repositories.yml similarity index 96% rename from group_vars/all/ah_ee_repositories.yml rename to group_vars/all/hub_ee_repositories.yml index be18cad..18d6257 100644 --- a/group_vars/all/ah_ee_repositories.yml +++ b/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 diff --git a/group_vars/all/ah_group_roles.yml b/group_vars/all/hub_group_roles.yml similarity index 94% rename from group_vars/all/ah_group_roles.yml rename to group_vars/all/hub_group_roles.yml index da9d9ca..8df4b06 100644 --- a/group_vars/all/ah_group_roles.yml +++ b/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 diff --git a/group_vars/all/ah_groups.yml b/group_vars/all/hub_groups.yml similarity index 83% rename from group_vars/all/ah_groups.yml rename to group_vars/all/hub_groups.yml index 24c096d..64ee467 100644 --- a/group_vars/all/ah_groups.yml +++ b/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 diff --git a/group_vars/all/ah_repositories.yml b/group_vars/all/hub_repositories.yml similarity index 94% rename from group_vars/all/ah_repositories.yml rename to group_vars/all/hub_repositories.yml index ce48a68..f8adf67 100644 --- a/group_vars/all/ah_repositories.yml +++ b/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 diff --git a/group_vars/all/users.yml b/group_vars/all/users.yml index 16a2ae3..edaef0e 100644 --- a/group_vars/all/users.yml +++ b/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 ... diff --git a/playbooks/hub_config.yml b/playbooks/hub_config.yml index 8f3170d..18c8bae 100644 --- a/playbooks/hub_config.yml +++ b/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: