Merge pull request #10 from mhutter/feature/daemon_json

Make daemon.json settings configurable

README.md

@@ -3,17 +3,20 @@
 docker
 =========
 
-Install Docker
-
-Requirements
-------------
-
-None
+Install and configure Docker.
 
 Role Variables
 --------------
 
-None
+### `docker_config`
+
+A dict of options that are written into docker's `daemon.json` config file. See [the docs for dockerd](https://docs.docker.com/engine/reference/commandline/dockerd/) for a full list of available options.
+
+Default values: (set them in your `docker_config` to overwrite)
+
+    storage-driver: devicemapper
+    log-level: info
+
 
 Dependencies
 ------------
@@ -23,10 +26,20 @@ None
 Example Playbook
 ----------------
 Install Docker
+```yaml
+- hosts: servers
+  roles:
+    - mongrelion.docker
 ```
+
+Install and configure docker
+```yaml
 - hosts: servers
   roles:
-     - mongrelion.docker
+    - role: mongrelion.docker
+      docker_config:
+        live-restore: true
+        userland-proxy: false
 ```
 
 Testing

defaults/main.yml

@@ -3,4 +3,6 @@ consul_ip: 127.0.0.1
 docker_clusterstore: no
 dockerpy: no
 vagrant: no
-docker_storagedriver: devicemapper
+default_docker_config:
+  storage-driver: devicemapper
+  log-level: info

tasks/main.yml

@@ -12,6 +12,15 @@
     version: 1.9.0
   when: dockerpy
 
+- name: apply default daemon config
+  set_fact:
+    docker_json: "{{ default_docker_config | combine(docker_config | default({})) }}"
+
+- name: configure docker clusterstore
+  set_fact:
+    docker_json: '{{ docker_json | combine({"cluster-store": "consul://{{ consul_ip }}:8500"})}}'
+  when: docker_clusterstore
+
 - name: ensure daemon config file is present
   template:
     src: daemon.j2.json

templates/daemon.j2.json

@@ -1,6 +1 @@
-{
-{% if docker_clusterstore %}
-  "cluster-store": "consul://{{ consul_ip }}:8500",
-{% endif %}
-  "log-level": "info"
-}
+{{ docker_json | to_nice_json(indent=2) }}

templates/docker.j2.service

@@ -8,7 +8,7 @@ Type=notify
 # the default is not to use systemd for cgroups because the delegate issues still
 # exists and systemd currently does not support the cgroup feature set required
 # for containers run by docker
-ExecStart=/usr/bin/docker daemon -H unix:///var/run/docker.sock -s {{ docker_storagedriver }}
+ExecStart=/usr/bin/docker daemon -H unix:///var/run/docker.sock
 ExecReload=/bin/kill -s HUP $MAINPID
 LimitNOFILE=1048576
 LimitNPROC=1048576