Merge pull request #33 from rhuss/master

fix: dockerd restart works again

roles/kubernetes/defaults/main.yml

@@ -8,7 +8,7 @@ images:
   weave: weaveworks/weave-kube:2.0.4
   weave_npc: weaveworks/weave-npc:2.0.4
 k8s:
-  version: 1.8.0*
+  version: 1.8.1*
   # Timing is good for demos. Defaults are 5min eviction and 40s node grace period
   # TODO: Not yet put into the k8s configuration
   pod_eviction_timeout: 5s

roles/kubernetes/tasks/docker.yml

@@ -10,17 +10,25 @@
 
 - name: Prepare docker expose args for service
   set_fact:
-    dockerd_extra_args: "{{ '-H tcp://' + inventory_hostname + ':2375' if docker.expose_tcp else '' }}"
+    dockerd_extra_args: "{{ ', \"hosts\": [ \"fd://\", \"tcp://0.0.0.0:2375\"]' if docker.expose_tcp else '' }}"
 
+- name: Replace the startu command for Docker
+  lineinfile: 
+    dest: /lib/systemd/system/docker.service
+    regexp: '^ExecStart'
+    line: 'ExecStart=/usr/bin/dockerd'
+    state: present
+  register: result_service
+
 - name: Update docker service startup
-  template: src=docker.service dest=/lib/systemd/system/docker.service
+  template: src=docker_daemon.json dest=/etc/docker/daemon.json
   register: result
   notify:
     - restart docker
 
 - name: Reload systemd when service definition changed
   command: systemctl daemon-reload
-  when: result|changed
+  when: result_service|changed
 
 - name: Notify Docker service right now to restart
   meta: flush_handlers

roles/kubernetes/templates/docker_daemon.json

@@ -0,0 +1,4 @@
+{ 
+  "storage-driver": "{{ docker.storage_driver }}"
+  {{ dockerd_extra_args }}
+}