From b1ab442fbc0cf5500aead51c8df79c87ac2b6991 Mon Sep 17 00:00:00 2001 From: mg Date: Thu, 24 Nov 2022 16:46:36 +0100 Subject: [PATCH] Housekeeping (#435) Co-authored-by: Michael Grote Reviewed-on: https://git.mgrote.net/mg/homeserver/pulls/435 --- .gitlab-ci.yml.old | 79 ------------------------------------ README.md | 2 - host_vars/pve5.grote.lan.yml | 1 - 3 files changed, 82 deletions(-) delete mode 100644 .gitlab-ci.yml.old diff --git a/.gitlab-ci.yml.old b/.gitlab-ci.yml.old deleted file mode 100644 index 16ab888e..00000000 --- a/.gitlab-ci.yml.old +++ /dev/null @@ -1,79 +0,0 @@ -stages: - - ping-test - - deploy-test - - ping-prod - - deploy-prod - -ping-test: - image: quotengrote/gitlab-ci-ansible:latest - stage: ping-test - interruptible: true - before_script: - - chmod 0755 /builds/mg/ansible - - echo "$id_rsa_ansible_user" > /builds/mg/ansible/id_rsa_ansible_user - - chmod 0400 /builds/mg/ansible/id_rsa_ansible_user - script: - - ansible -i inventory --limit test --vault-password-file $ansible_vault_pass all -m ping - after_script: - - rm /builds/mg/ansible/id_rsa_ansible_user - rules: - - if: $CI_MERGE_REQUEST_ID - tags: - - ansible - - - -ansible-deploy-test: - image: quotengrote/gitlab-ci-ansible:latest - stage: deploy-test - interruptible: false - before_script: - - chmod 0755 /builds/mg/ansible - - echo "$id_rsa_ansible_user" > /builds/mg/ansible/id_rsa_ansible_user - - chmod 0400 /builds/mg/ansible/id_rsa_ansible_user - script: - - ansible-playbook playbooks/base/0_master.yml playbooks/service/* -i inventory --limit test --vault-password-file $ansible_vault_pass - after_script: - - rm /builds/mg/ansible/id_rsa_ansible_user - rules: - - if: $CI_MERGE_REQUEST_ID - tags: - - ansible - -ping-prod: - image: quotengrote/gitlab-ci-ansible:latest - stage: ping-prod - interruptible: true - before_script: - - chmod 0755 /builds/mg/ansible - - echo "$id_rsa_ansible_user" > /builds/mg/ansible/id_rsa_ansible_user - - chmod 0400 /builds/mg/ansible/id_rsa_ansible_user - script: - - ansible -i inventory --limit production --vault-password-file $ansible_vault_pass all -m ping - after_script: - - rm /builds/mg/ansible/id_rsa_ansible_user - rules: - - if: $CI_COMMIT_BRANCH == 'master' - tags: - - ansible - -ansible-deploy-prod: - image: quotengrote/gitlab-ci-ansible:latest - stage: deploy-prod - interruptible: false - before_script: - - chmod 0755 /builds/mg/ansible - - echo "$id_rsa_ansible_user" > /builds/mg/ansible/id_rsa_ansible_user - - chmod 0400 /builds/mg/ansible/id_rsa_ansible_user - script: - - ansible-playbook playbooks/base/0_master.yml playbooks/service/* -i inventory --limit production --vault-password-file $ansible_vault_pass - after_script: - - rm /builds/mg/ansible/id_rsa_ansible_user - rules: - - if: $CI_COMMIT_BRANCH == 'master' - tags: - - ansible - -# GitLab-CI-Vars -# $ansible_vault_pass - Type: File -# $id_rsa_ansible_user - Type: Variable diff --git a/README.md b/README.md index 82700cad..b630fb59 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ # ansible_heimserver -[![Build Status](http://docker10.grote.lan/api/badges/mg/ansible/status.svg)](http://docker10.grote.lan/mg/ansible) - ## example-cli `ansible-playbook playbooks/base/0_master.yml -i inventory --key-file id_rsa_ansible_user --vault-password-file vault-pass.yml --limit jenkins-test.grote.lan` diff --git a/host_vars/pve5.grote.lan.yml b/host_vars/pve5.grote.lan.yml index e2e8ad45..fc6751d0 100644 --- a/host_vars/pve5.grote.lan.yml +++ b/host_vars/pve5.grote.lan.yml @@ -169,7 +169,6 @@ recursive: 'no' snapshots: true template: '3tage' - template: '3tage' - path: rpool/data/k3s recursive: 'no' snapshots: true