From bf094a02d668d185f4554fa2dab6b10c9e7664da Mon Sep 17 00:00:00 2001
From: Pim Kunis <pim@kunis.nl>
Date: Mon, 17 Apr 2023 19:35:33 +0200
Subject: [PATCH] put docker role in separate repo

---
 ansible/inventory/host_vars/max.yml    |  6 +++-
 ansible/requirements.yml               |  6 ++++
 ansible/roles/docker/files/daemon.json |  7 -----
 ansible/roles/docker/tasks/main.yml    | 41 --------------------------
 4 files changed, 11 insertions(+), 49 deletions(-)
 delete mode 100644 ansible/roles/docker/files/daemon.json
 delete mode 100644 ansible/roles/docker/tasks/main.yml

diff --git a/ansible/inventory/host_vars/max.yml b/ansible/inventory/host_vars/max.yml
index 55ff4c3..d77112b 100644
--- a/ansible/inventory/host_vars/max.yml
+++ b/ansible/inventory/host_vars/max.yml
@@ -1,5 +1,6 @@
 base_data_dir: /mnt/data
 base_service_dir: /srv
+domain_name_pim: pim.kunis.nl
 
 # Additional open ports
 jitsi_videobridge_port: 54562
@@ -8,4 +9,7 @@ prometheus_port: 8081
 traefik_api_port: 8080
 internal_forgejo_port: 3000 # Needed to pull from a repository from another docker container.
 
-domain_name_pim: pim.kunis.nl
+docker_daemon_config:
+  default-address-pools:
+  - base: "10.204.0.0/16"
+    size: 24
diff --git a/ansible/requirements.yml b/ansible/requirements.yml
index 971722f..b799430 100644
--- a/ansible/requirements.yml
+++ b/ansible/requirements.yml
@@ -1,3 +1,9 @@
 - name: setup-apt
   src: https://github.com/sunscrapers/ansible-role-apt.git
   scm: git
+- name: cloudinit-wait
+  src: https://git.pim.kunis.nl/pim/ansible-role-cloudinit-wait
+  scm: git
+- name: docker
+  src: https://git.pim.kunis.nl/pim/ansible-role-docker
+  scm: git
diff --git a/ansible/roles/docker/files/daemon.json b/ansible/roles/docker/files/daemon.json
deleted file mode 100644
index 10fc298..0000000
--- a/ansible/roles/docker/files/daemon.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-"default-address-pools":
-[
-{"base":"10.204.0.0/16","size":24}
-
-]
-}
diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml
deleted file mode 100644
index 7b7b88b..0000000
--- a/ansible/roles/docker/tasks/main.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-- name: Install Docker prerequisites
-  apt:
-    pkg:
-      - ca-certificates
-      - curl
-      - gnupg
-      - lsb-release
-      - python3-pip
-- name: Add Docker APT key
-  apt_key:
-    url: https://download.docker.com/linux/ubuntu/gpg
-    keyring: /etc/apt/keyrings/docker.gpg
-- name: Add Docker repository
-  apt_repository:
-    repo: "deb [signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian {{ ansible_distribution_release }} stable"
-  register: apt_repository
-- name: Update APT cache
-  apt:
-    update_cache: true
-  when: apt_repository.changed
-- name: Install Docker packages
-  apt:
-    pkg:
-      - docker-ce
-      - docker-ce-cli
-      - containerd.io
-      - docker-compose-plugin
-- name: Install Docker modules for Python
-  pip:
-    name:
-      - docker
-      - docker-compose
-- name: Copy daemon.json
-  copy:
-    src: "{{ role_path }}/files/daemon.json"
-    dest: /etc/docker/daemon.json
-- name: Start Docker
-  systemd:
-    name: docker
-    enabled: true
-    state: started