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
redhat-cop · Nov 11, 2024 · 2a57c0d · 2a57c0d
1 parent a7d0574
commit 2a57c0d
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 109 deletions.
diff --git a/playbooks/controller_config.yml → playbooks/aap_config.yml b/playbooks/controller_config.yml → 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
@@ -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
diff --git a/playbooks/hub_config.yml b/playbooks/hub_config.yml
diff --git 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
@@ -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
 ...