Merge pull request 'docker: Improve deployment' (!128) from alex/netz39-infra-ansible:docker into master

Reviewed-on: https://gitea.n39.eu/Netz39_Admin/netz39-infra-ansible/pulls/128
Reviewed-by: Stefan Haun <tux@netz39.de>

group-docker_host.yml

@@ -0,0 +1,6 @@
+---
+- hosts: docker_host
+  become: true
+
+  roles:
+    - role: docker_setup

group_vars/docker_host/vars.yml

@@ -0,0 +1,2 @@
+---
+docker_data_root: "/srv/docker"

host-krypton.yml

@@ -20,9 +20,7 @@
 
 
   roles:
-    - role: docker_setup
+    # role 'docker_setup' applied through group 'docker_host'
-      vars:
-        docker_data_root: "/srv/docker"
     - role: apache
     - role: apache_letsencrypt  # Uses configuration from dehydrated setup
     - role: ansible-role-dehydrated

host-pottwal.yml

@@ -3,9 +3,7 @@
   become: true
 
   roles:
-    - role: docker_setup
+    # role 'docker_setup' applied through group 'docker_host'
-      vars:
-        docker_data_root: "/srv/docker"
     - role: apache
     - role: apache_letsencrypt  # Uses configuration from dehydrated setup
     - role: ansible-role-dehydrated

host-radon.yml

@@ -22,9 +22,7 @@
     brotherql_web_image: "pklaus/brother_ql_web:alpine_9e20b6d"
 
   roles:
-    - role: docker_setup
+    # role 'docker_setup' applied through group 'docker_host'
-      vars:
-        docker_data_root: "/srv/docker"
     - role: apache
     - role: apache_letsencrypt  # Uses configuration from dehydrated setup
     - role: ansible-role-dehydrated

host-tau.yml

@@ -17,7 +17,7 @@
     dokuwiki_image: "bitnami/dokuwiki:20220731@sha256:989ab52cf2d2e0f84166e114ca4ce88f59546b8f6d34958905f8d81c18cbd759"
 
   roles:
-    - role: docker_setup
+    # role 'docker_setup' applied through group 'docker_host'
     - role: apache
     - role: penguineer.dehydrated_cron
 

host-unicorn.yml

@@ -5,10 +5,10 @@
   vars:
     ansible_python_interpreter: /usr/bin/python3
     data_dir: "/srv/data"
+
   roles:
-    - role: docker_setup
+    # role 'docker_setup' applied through group 'docker_host'
-      vars:
+
-        docker_data_root: "/srv/docker"
   tasks:
     - name: Setup the docker container for unifi-controller
       docker_container:

host_vars/tau.netz39.de/vars.yml

@@ -1,3 +1,4 @@
 ---
 server_admin: "admin+tau@netz39.de"
 mysql_root_pw: "{{ vault_mysql_root_pw }}"
+docker_data_root: "/var/lib/docker"

inventory.yml

@@ -3,36 +3,43 @@ all:
   hosts:
     tau.netz39.de:
     beaker.n39.eu:
-    pottwal.n39.eu:
+    hobbes.n39.eu:
-    unicorn.n39.eu:
+    holmium.n39.eu:
-    platon.n39.eu:
-    radon.n39.eu:
     krypton.n39.eu:
     oganesson.n39.eu:
-    holmium.n39.eu:
+    platon.n39.eu:
-    hobbes.n39.eu:
+    pottwal.n39.eu:
+    radon.n39.eu:
+    unicorn.n39.eu:
 
   children:
+    docker_host:
+      hosts:
+        krypton.n39.eu:
+        pottwal.n39.eu:
+        radon.n39.eu:
+        tau.netz39.de:
+        unicorn.n39.eu:
     proxmox:
       hosts:
-        pottwal.n39.eu:
+        holmium.n39.eu:
-        unicorn.n39.eu:
-        radon.n39.eu:
         krypton.n39.eu:
         oganesson.n39.eu:
-        holmium.n39.eu:
+        pottwal.n39.eu:
+        radon.n39.eu:
+        unicorn.n39.eu:
     ssh_jump:
       hosts:
-        pottwal.n39.eu:
+        beaker.n39.eu:
-        unicorn.n39.eu:
+        hobbes.n39.eu:
-        radon.n39.eu:
+        holmium.n39.eu:
         krypton.n39.eu:
         oganesson.n39.eu:
-        holmium.n39.eu:
         platon.n39.eu:
-        beaker.n39.eu:
+        pottwal.n39.eu:
+        radon.n39.eu:
         wittgenstein.n39.eu:
-        hobbes.n39.eu:
+        unicorn.n39.eu:
     ssh_no_jump:
       hosts:
         tau.netz39.de:

main.yml

@@ -7,6 +7,9 @@
 - name: Specific setup for all proxmox hosts
   import_playbook: group-proxmox.yml
 
+- name: Specific setup for all docker host hosts
+  import_playbook: group-docker_host.yml
+
 - name: Tau specific setup
   import_playbook: host-tau.yml