diff --git a/group_vars/controller/ad_hoc_commands.yml b/group_vars/controller/ad_hoc_commands.yml deleted file mode 100644 index c72ec9a..0000000 --- a/group_vars/controller/ad_hoc_commands.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -controller_ad_hoc_commands: - - job_type: run - inventory: localhost - credential: Demo Credential - module_name: ping diff --git a/group_vars/controller/inventories.yml b/group_vars/controller/inventories.yml index 759b8ca..eef6ac6 100644 --- a/group_vars/controller/inventories.yml +++ b/group_vars/controller/inventories.yml @@ -1,6 +1,4 @@ --- controller_inventories: - - name: Local - organization: Platform - - name: Vault + - name: Controller organization: Platform diff --git a/group_vars/controller/inventory_sources.yml b/group_vars/controller/inventory_sources.yml index 0f6be08..34ac625 100644 --- a/group_vars/controller/inventory_sources.yml +++ b/group_vars/controller/inventory_sources.yml @@ -1,11 +1,11 @@ --- controller_inventory_sources: - - name: Inventory + - name: Controller source: scm - source_project: Inventory + source_project: Controller source_path: inventory - inventory: Inventory + inventory: Controller credential: Vagrant overwrite: true - update_on_launch: false + update_on_launch: true update_cache_timeout: 0 diff --git a/group_vars/controller/job_templates.yml b/group_vars/controller/job_templates.yml index 740a781..29322bd 100644 --- a/group_vars/controller/job_templates.yml +++ b/group_vars/controller/job_templates.yml @@ -1,10 +1,10 @@ --- controller_templates: - - name: Deploy Software + - name: GitOps Reconciliation job_type: run - inventory: Inventory - project: Project + inventory: Controller + project: Controller playbook: playbook.yml credentials: - - Vagrant - 'ansible-vault' + state: present diff --git a/group_vars/controller/projects.yml b/group_vars/controller/projects.yml index d1a2f86..eb723c4 100644 --- a/group_vars/controller/projects.yml +++ b/group_vars/controller/projects.yml @@ -1,18 +1,11 @@ --- controller_projects: - - name: Project + - name: Controller organization: Platform scm_branch: main - scm_clean: false - scm_delete_on_update: false + scm_clean: true + scm_delete_on_update: true scm_type: git scm_update_on_launch: false - scm_url: https://github.com/playingfield/ansible_project.git - - name: Inventory - organization: Platform - scm_branch: main - scm_clean: false - scm_delete_on_update: false - scm_type: git - scm_update_on_launch: false - scm_url: https://github.com/playingfield/ansible_inventory.git + scm_url: https://github.com/playingfield/ansible_controller.git + state: present diff --git a/group_vars/controller/settings.yml b/group_vars/controller/settings.yml index f598550..14f4b6d 100644 --- a/group_vars/controller/settings.yml +++ b/group_vars/controller/settings.yml @@ -1,4 +1,5 @@ --- +controller_configuration_project_update_async_retries: 180 controller_settings: settings: AWX_ISOLATION_BASE_PATH: /var/tmp