From ebf0833680ac4cadac699cd4c0a717a67146efcc Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 19 Jan 2019 00:02:36 +0100
Subject: docker role can now set the daemon config before it is installed

---
 roles/docker/defaults/main.yml         |  2 ++
 roles/docker/handlers/main.yml         |  5 +++++
 roles/docker/tasks/main.yml            | 15 +++++++++++++++
 roles/kubernetes/base/meta/main.yml    |  3 ---
 roles/kubernetes/net/files/daemon.json |  4 ----
 roles/kubernetes/net/tasks/add.yml     | 11 -----------
 6 files changed, 22 insertions(+), 18 deletions(-)
 create mode 100644 roles/docker/handlers/main.yml
 delete mode 100644 roles/kubernetes/base/meta/main.yml
 delete mode 100644 roles/kubernetes/net/files/daemon.json

(limited to 'roles')

diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
index 50075b1a..b2c21963 100644
--- a/roles/docker/defaults/main.yml
+++ b/roles/docker/defaults/main.yml
@@ -6,3 +6,5 @@ docker_pkg_name: docker.io
 # docker_pkg_name: docker-ce
 
 # docker_pkg_version:
+
+# docker_daemon_config: {}
diff --git a/roles/docker/handlers/main.yml b/roles/docker/handlers/main.yml
new file mode 100644
index 00000000..3627303e
--- /dev/null
+++ b/roles/docker/handlers/main.yml
@@ -0,0 +1,5 @@
+---
+- name: restart docker
+  service:
+    name: docker
+    state: restarted
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 017e2786..8da13f77 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -1,4 +1,19 @@
 ---
+- name: install docker daemon config
+  when: docker_daemon_config is defined
+  block:
+    - name: create docker config directory
+      file:
+        name: /etc/docker
+        state: directory
+        mode: 0700
+
+    - name: write docker daemon config
+      copy:
+        content: "{{ docker_daemon_config | to_nice_json }}\n"
+        dest: /etc/docker/daemon.json
+      notify: restart docker
+
 - name: prepare /var/lib/docker as LVM
   when: docker_lvm is defined
   block:
diff --git a/roles/kubernetes/base/meta/main.yml b/roles/kubernetes/base/meta/main.yml
deleted file mode 100644
index 724b20f1..00000000
--- a/roles/kubernetes/base/meta/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-dependencies:
-- role: docker
diff --git a/roles/kubernetes/net/files/daemon.json b/roles/kubernetes/net/files/daemon.json
deleted file mode 100644
index 28001640..00000000
--- a/roles/kubernetes/net/files/daemon.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "bridge": "none",
-  "iptables": false
-}
diff --git a/roles/kubernetes/net/tasks/add.yml b/roles/kubernetes/net/tasks/add.yml
index f4e422c6..da7ac424 100644
--- a/roles/kubernetes/net/tasks/add.yml
+++ b/roles/kubernetes/net/tasks/add.yml
@@ -1,15 +1,4 @@
 ---
-- name: create docker config directory
-  file:
-    name: /etc/docker
-    state: directory
-    mode: 0700
-
-- name: disable docker iptables and bridge
-  copy:
-    src: daemon.json
-    dest: /etc/docker/daemon.json
-
 - name: create network config directory
   file:
     name: /var/lib/kubenet/
-- 
cgit v1.2.3