From f8be1777895dc76cd94752ba16c5b6ac82d49bb5 Mon Sep 17 00:00:00 2001 From: Jacob Babor Date: Fri, 17 Jan 2025 10:02:46 -0600 Subject: [PATCH] Really fully disable site_common.yml --- .gitlab-ci.yml | 7 ------- playbooks/site_common.yml | 5 ----- site.yml | 3 --- 3 files changed, 15 deletions(-) delete mode 100755 playbooks/site_common.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a0214ed..6188fc6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,13 +86,6 @@ Main: retry: 1 script: - ansible-playbook --skip-tags no-auto playbooks/site_main.yml --ssh-common-args='-o ProxyCommand="ssh -W %h:%p -q ansible@bastion1.dallas.mgmt.desu.ltd"' --vault-password-file ~/.vault_pass -Common: - stage: play-main - only: - - pipelines - - schedules - script: - - ansible-playbook --skip-tags no-auto playbooks/site_common.yml --ssh-common-args='-o ProxyCommand="ssh -W %h:%p -q ansible@bastion1.dallas.mgmt.desu.ltd"' --vault-password-file ~/.vault_pass # CLEANUP Cleanup: diff --git a/playbooks/site_common.yml b/playbooks/site_common.yml deleted file mode 100755 index cca8842..0000000 --- a/playbooks/site_common.yml +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env ansible-playbook -# vim:ft=ansible: ---- - # Supplementary tags -#- import_playbook: whatever diff --git a/site.yml b/site.yml index feb1047..d8800b2 100755 --- a/site.yml +++ b/site.yml @@ -7,8 +7,5 @@ - import_playbook: playbooks/site_pre.yml # Main environment configuration - import_playbook: playbooks/site_main.yml - # Supplementary tags - # Uncomment me if you re-add supplementary stuff -#- import_playbook: playbooks/site_common.yml # Post-play housekeeping and reboots - import_playbook: playbooks/site_post.yml