From 9962d9103f14d3c575a3314980cd68e127662c61 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Thu, 23 Apr 2020 20:17:54 +0100
Subject: [PATCH] Extract docker cleanup stuff into its own role

---
 ansible/main.yml                                              | 1 +
 .../{docker => docker-cleanup}/files/docker-utils/ctop.sh     | 0
 .../files/docker-utils/hard-reset-all.sh                      | 0
 .../{docker => docker-cleanup}/files/docker-utils/occ.sh      | 0
 .../{docker => docker-cleanup}/files/docker-utils/pull-all.sh | 0
 .../files/docker-utils/start-all.sh                           | 0
 .../{docker => docker-cleanup}/files/docker-utils/stop-all.sh | 0
 .../tasks/setup-docker.yml => docker-cleanup/tasks/main.yml}  | 3 +++
 ansible/roles/docker-cleanup/vars/docker.yml                  | 3 +++
 ansible/roles/docker/tasks/main.yml                           | 3 ---
 ansible/roles/docker/vars/docker.yml                          | 4 ----
 11 files changed, 7 insertions(+), 7 deletions(-)
 rename ansible/roles/{docker => docker-cleanup}/files/docker-utils/ctop.sh (100%)
 rename ansible/roles/{docker => docker-cleanup}/files/docker-utils/hard-reset-all.sh (100%)
 rename ansible/roles/{docker => docker-cleanup}/files/docker-utils/occ.sh (100%)
 rename ansible/roles/{docker => docker-cleanup}/files/docker-utils/pull-all.sh (100%)
 rename ansible/roles/{docker => docker-cleanup}/files/docker-utils/start-all.sh (100%)
 rename ansible/roles/{docker => docker-cleanup}/files/docker-utils/stop-all.sh (100%)
 rename ansible/roles/{docker/tasks/setup-docker.yml => docker-cleanup/tasks/main.yml} (91%)
 create mode 100644 ansible/roles/docker-cleanup/vars/docker.yml

diff --git a/ansible/main.yml b/ansible/main.yml
index 34c10c5..11d31db 100644
--- a/ansible/main.yml
+++ b/ansible/main.yml
@@ -20,4 +20,5 @@
         docker_install_compose: false  # This role installs the binary directly, which is kinda nasty
         docker_users:
           - "{{ user }}"
+    - docker-cleanup
     - docker
diff --git a/ansible/roles/docker/files/docker-utils/ctop.sh b/ansible/roles/docker-cleanup/files/docker-utils/ctop.sh
similarity index 100%
rename from ansible/roles/docker/files/docker-utils/ctop.sh
rename to ansible/roles/docker-cleanup/files/docker-utils/ctop.sh
diff --git a/ansible/roles/docker/files/docker-utils/hard-reset-all.sh b/ansible/roles/docker-cleanup/files/docker-utils/hard-reset-all.sh
similarity index 100%
rename from ansible/roles/docker/files/docker-utils/hard-reset-all.sh
rename to ansible/roles/docker-cleanup/files/docker-utils/hard-reset-all.sh
diff --git a/ansible/roles/docker/files/docker-utils/occ.sh b/ansible/roles/docker-cleanup/files/docker-utils/occ.sh
similarity index 100%
rename from ansible/roles/docker/files/docker-utils/occ.sh
rename to ansible/roles/docker-cleanup/files/docker-utils/occ.sh
diff --git a/ansible/roles/docker/files/docker-utils/pull-all.sh b/ansible/roles/docker-cleanup/files/docker-utils/pull-all.sh
similarity index 100%
rename from ansible/roles/docker/files/docker-utils/pull-all.sh
rename to ansible/roles/docker-cleanup/files/docker-utils/pull-all.sh
diff --git a/ansible/roles/docker/files/docker-utils/start-all.sh b/ansible/roles/docker-cleanup/files/docker-utils/start-all.sh
similarity index 100%
rename from ansible/roles/docker/files/docker-utils/start-all.sh
rename to ansible/roles/docker-cleanup/files/docker-utils/start-all.sh
diff --git a/ansible/roles/docker/files/docker-utils/stop-all.sh b/ansible/roles/docker-cleanup/files/docker-utils/stop-all.sh
similarity index 100%
rename from ansible/roles/docker/files/docker-utils/stop-all.sh
rename to ansible/roles/docker-cleanup/files/docker-utils/stop-all.sh
diff --git a/ansible/roles/docker/tasks/setup-docker.yml b/ansible/roles/docker-cleanup/tasks/main.yml
similarity index 91%
rename from ansible/roles/docker/tasks/setup-docker.yml
rename to ansible/roles/docker-cleanup/tasks/main.yml
index fa6991a..35ffbdf 100644
--- a/ansible/roles/docker/tasks/setup-docker.yml
+++ b/ansible/roles/docker-cleanup/tasks/main.yml
@@ -1,3 +1,6 @@
+- name: Include docker variables
+  include_vars: docker.yml
+
 - name: Install docker-compose
   apt:
     name: docker-compose
diff --git a/ansible/roles/docker-cleanup/vars/docker.yml b/ansible/roles/docker-cleanup/vars/docker.yml
new file mode 100644
index 0000000..1d68f11
--- /dev/null
+++ b/ansible/roles/docker-cleanup/vars/docker.yml
@@ -0,0 +1,3 @@
+docker_user:
+  id: 3000
+  name: dockeruser
diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml
index 9e36e19..89e7277 100644
--- a/ansible/roles/docker/tasks/main.yml
+++ b/ansible/roles/docker/tasks/main.yml
@@ -1,9 +1,6 @@
 - name: Include docker variables
   include_vars: docker.yml
 
-- name: Install Docker
-  include: setup-docker.yml
-
 # Applications
 
 - name: Install calibre
diff --git a/ansible/roles/docker/vars/docker.yml b/ansible/roles/docker/vars/docker.yml
index 61c562d..497d574 100644
--- a/ansible/roles/docker/vars/docker.yml
+++ b/ansible/roles/docker/vars/docker.yml
@@ -1,6 +1,2 @@
-docker_user:
-  id: 3000
-  name: dockeruser
-
 docker_compose_file_mask: 0664
 docker_compose_directory_mask: 0775