From 0e8919b079caadbedbb4687672c8ce6541602378 Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Wed, 3 Aug 2022 21:41:10 +0100 Subject: [PATCH] adding mount dir and additional variables --- ansible/homelab/playbooks/mount-hdds.yml | 13 +++++++ ansible/homelab/playbooks/restore-all.yml | 10 ++++++ ansible/homelab/playbooks/setup-home-lab.yml | 5 +-- .../tasks/install-dev-tooling-tasks.yml | 1 + .../homelab/tasks/install-docker-tasks.yml | 36 ++++++++++++++++++- ansible/homelab/variables.yml | 2 ++ 6 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 ansible/homelab/playbooks/mount-hdds.yml diff --git a/ansible/homelab/playbooks/mount-hdds.yml b/ansible/homelab/playbooks/mount-hdds.yml new file mode 100644 index 0000000..c9236b2 --- /dev/null +++ b/ansible/homelab/playbooks/mount-hdds.yml @@ -0,0 +1,13 @@ +--- +- hosts: servers + vars_files: + - ../variables.yml + become: true + tasks: + - name: Mount up device by UUID + ansible.posix.mount: + path: /mnt/hdds + src: "UUID={{hdds_uuid}}" + fstype: ext4 + state: mounted + opts: default,nofail \ No newline at end of file diff --git a/ansible/homelab/playbooks/restore-all.yml b/ansible/homelab/playbooks/restore-all.yml index 898c81b..30e6fbe 100644 --- a/ansible/homelab/playbooks/restore-all.yml +++ b/ansible/homelab/playbooks/restore-all.yml @@ -44,3 +44,13 @@ vars: container_name: "nginx-proxy-manager" stack_name: "nginx-proxy-manager" + + - name: Restore Vpn Stack + import_tasks: ../tasks/restore-volume-tasks.yml + vars: + container_name: "vpn-stack" + + - name: Start Vpn Stack + import_tasks: ../tasks/create-stack-tasks.yml + vars: + stack_name: "vpn-stack" diff --git a/ansible/homelab/playbooks/setup-home-lab.yml b/ansible/homelab/playbooks/setup-home-lab.yml index e2f0568..92b5c5c 100644 --- a/ansible/homelab/playbooks/setup-home-lab.yml +++ b/ansible/homelab/playbooks/setup-home-lab.yml @@ -28,6 +28,7 @@ - name: Install Docker import_tasks: ../tasks/install-docker-tasks.yml - - name: Start Portainer + - name: Create and Portainer tags: "skip-e2e" # we can't mount volumes on test runners. - command: "chdir={{home_lab_checkout_dir}}/docker-compose/portainer docker-compose up -d" + community.docker.docker_compose: + project_src: "{{home_lab_checkout_dir}}/docker-compose/portainer" diff --git a/ansible/homelab/tasks/install-dev-tooling-tasks.yml b/ansible/homelab/tasks/install-dev-tooling-tasks.yml index bd44c7a..58a2c7d 100644 --- a/ansible/homelab/tasks/install-dev-tooling-tasks.yml +++ b/ansible/homelab/tasks/install-dev-tooling-tasks.yml @@ -5,3 +5,4 @@ - jq - fzf - git + - mdadm diff --git a/ansible/homelab/tasks/install-docker-tasks.yml b/ansible/homelab/tasks/install-docker-tasks.yml index 3789f7a..561fb84 100644 --- a/ansible/homelab/tasks/install-docker-tasks.yml +++ b/ansible/homelab/tasks/install-docker-tasks.yml @@ -32,8 +32,42 @@ pip: name: docker +- name: Install Docker Compose Module for Python + pip: + name: docker-compose + - name: Install docker-compose get_url: url : https://github.com/docker/compose/releases/download/1.25.1-rc1/docker-compose-Linux-x86_64 dest: /usr/local/bin/docker-compose - mode: 'u+x,g+x' \ No newline at end of file + mode: 'u+x,g+x' + +#- name: Stop Docker Service +# ansible.builtin.shell: sudo service docker stop + +# Change the docker dir. +- name: Stop docker service + ansible.builtin.service: + name: docker + state: stopped + +- name: Change volume path + copy: + dest: "/etc/docker/daemon.json" + content: | + { + "data-root": "{{docker_daemon_host_path}}" + } + +- name: Backup old files + ansible.builtin.shell: cp -r /var/lib/docker /var/lib/docker.bak + +- name: Delete old docker directory + file: + state: absent + path: /var/lib/docker + +- name: Start docker service + ansible.builtin.service: + name: docker + state: started diff --git a/ansible/homelab/variables.yml b/ansible/homelab/variables.yml index 2b082ab..2c46163 100644 --- a/ansible/homelab/variables.yml +++ b/ansible/homelab/variables.yml @@ -4,3 +4,5 @@ homelab_group: cianhatton backup_dir: /mnt/hdds/backups/ docker_volume_backup_image: ghcr.io/chatton/docker-volume-backup:master home_lab_checkout_dir: /home/cianhatton/checkouts/HomeLab +hdds_uuid: 8d6e8b33-7d7f-456b-9976-7baea0cf4260 +docker_daemon_host_path: /mnt/ssds/docker