From 2a57c0d251fb33ef8d794b954d5cc9a90fa56d70 Mon Sep 17 00:00:00 2001 From: David Danielsson Date: Mon, 11 Nov 2024 15:44:22 -0600 Subject: [PATCH] renamed: playbooks/controller_config.yml -> playbooks/aap_config.yml modified: playbooks/custom_collection.yml deleted: playbooks/eda_config.yml deleted: playbooks/hub_config.yml modified: playbooks/install_configure.yml modified: playbooks/sync_collections.yml --- .../{controller_config.yml => aap_config.yml} | 2 +- playbooks/custom_collection.yml | 4 +- playbooks/eda_config.yml | 12 --- playbooks/hub_config.yml | 81 ------------------- playbooks/install_configure.yml | 13 +-- playbooks/sync_collections.yml | 2 +- 6 files changed, 5 insertions(+), 109 deletions(-) rename playbooks/{controller_config.yml => aap_config.yml} (95%) delete mode 100644 playbooks/eda_config.yml delete mode 100644 playbooks/hub_config.yml diff --git a/playbooks/controller_config.yml b/playbooks/aap_config.yml similarity index 95% rename from playbooks/controller_config.yml rename to playbooks/aap_config.yml index 098faf5..d4ea398 100644 --- a/playbooks/controller_config.yml +++ b/playbooks/aap_config.yml @@ -26,5 +26,5 @@ - name: Call dispatch role ansible.builtin.include_role: - name: infra.controller_configuration.dispatch + name: infra.aap_configuration.dispatch ... diff --git a/playbooks/custom_collection.yml b/playbooks/custom_collection.yml index 6f4c52d..217cbcf 100644 --- a/playbooks/custom_collection.yml +++ b/playbooks/custom_collection.yml @@ -8,9 +8,9 @@ tasks: - name: Include namespace role ansible.builtin.include_role: - name: infra.ah_configuration.namespace + name: infra.aap_configuration.hub_namespace - name: Include publish role ansible.builtin.include_role: - name: infra.ah_configuration.publish + name: infra.aap_configuration.hub_publish ... diff --git a/playbooks/eda_config.yml b/playbooks/eda_config.yml deleted file mode 100644 index bd35602..0000000 --- a/playbooks/eda_config.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- name: Playbook to configure event driven ansible controller post installation - hosts: all - vars_files: - - "../vaults/{{ env }}.yml" - connection: local - tasks: - - name: Call dispatch role - ansible.builtin.include_role: - name: infra.eda_configuration.dispatch - -... diff --git a/playbooks/hub_config.yml b/playbooks/hub_config.yml deleted file mode 100644 index 18c8bae..0000000 --- a/playbooks/hub_config.yml +++ /dev/null @@ -1,81 +0,0 @@ ---- -- name: Configure private automation hub after installation - hosts: all - gather_facts: false - connection: local - vars_files: - - ../vaults/{{ env }}.yml - tasks: - # Pending a bug fix - # - name: Include dispatch role - # ansible.builtin.include_role: - # name: infra.ah_configuration.dispatch - - - name: Include collection_remote role - ansible.builtin.include_role: - name: infra.ah_configuration.collection_remote - - - name: Include collection_repository role - ansible.builtin.include_role: - name: infra.ah_configuration.collection_repository - - - name: Include collection_repository_sync role - ansible.builtin.include_role: - name: infra.ah_configuration.collection_repository_sync - - - name: Publish custom collections - when: publish | default(false) - block: - - name: Include namespace role - ansible.builtin.include_role: - name: infra.ah_configuration.namespace - - - name: Include publish role - ansible.builtin.include_role: - name: infra.ah_configuration.publish - - - name: Include ee_registry role - ansible.builtin.include_role: - name: infra.ah_configuration.ee_registry - 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: 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: hub_ee_registries | length is not match('0') - - - name: Include ee_repository role - ansible.builtin.include_role: - name: infra.ah_configuration.ee_repository - 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: hub_ee_repositories | length is not match('0') - - - name: Include ee_image role - ansible.builtin.include_role: - name: infra.ah_configuration.ee_image - when: hub_ee_images | length is not match('0') - - - name: Include group role - ansible.builtin.include_role: - name: infra.ah_configuration.group - when: aap_teams | length is not match('0') - - - name: Include group_roles role - ansible.builtin.include_role: - name: infra.ah_configuration.group_roles - when: hub_group_roles | length is not match('0') - - - name: Include user role - ansible.builtin.include_role: - name: infra.ah_configuration.user - when: aap_user_accounts | length is not match('0') -... diff --git a/playbooks/install_configure.yml b/playbooks/install_configure.yml index 11466af..ab251ee 100644 --- a/playbooks/install_configure.yml +++ b/playbooks/install_configure.yml @@ -17,17 +17,6 @@ ansible.builtin.include_role: name: infra.aap_utilities.aap_setup_install -- name: Configure private automation hub after installation - hosts: "{{ env | default('dev') }}" # noqa: syntax-check - gather_facts: false - connection: local - vars_files: - - "../vaults/{{ env }}.yml" - tasks: - - name: Call dispatch role - ansible.builtin.include_role: - name: infra.ah_configuration.dispatch - - name: Configure ansible controller post installation hosts: "{{ env | default('dev') }}" # noqa: syntax-check vars_files: @@ -74,7 +63,7 @@ - name: Call dispatch role ansible.builtin.include_role: - name: infra.controller_configuration.dispatch + name: infra.aap_configuration.dispatch - name: Launch build execution environment job template awx.awx.job_launch: diff --git a/playbooks/sync_collections.yml b/playbooks/sync_collections.yml index 24a135b..98b828b 100644 --- a/playbooks/sync_collections.yml +++ b/playbooks/sync_collections.yml @@ -8,5 +8,5 @@ tasks: - name: Include collection_repository_sync role ansible.builtin.include_role: - name: infra.ah_configuration.collection_repository_sync + name: infra.aap_configuration.hub_collection_repository_sync ...