Merge pull request #461 from kubespray/issue-369

Issue 369

roles/network_plugin/flannel/tasks/main.yml

@@ -42,12 +42,18 @@
     mode: 0644
   notify:
     - restart docker
+  when: ansible_os_family != "CoreOS"
 
-- name: Flannel | Create docker config symlink for CoreOS
-  file:
-    src: "/etc/default/docker"
-    dest: "/run/flannel_docker_opts.env"
-    state: link
+- name: Flannel | Create docker service path for CoreOS
+  file: path=/etc/systemd/system/docker.service.d state=directory
+  when: ansible_os_family == "CoreOS"
+
+- name: Flannel | Create docker dropin for CoreOS
+  template:
+    src: docker-systemd
+    dest: "/etc/systemd/system/docker.service.d/flannel-options.conf"
+  notify:
+    - restart docker
   when: ansible_os_family == "CoreOS"
 
 - meta: flush_handlers

roles/network_plugin/flannel/templates/docker-systemd

@@ -0,0 +1,2 @@
+[Service]
+Environment="DOCKER_OPTS=--bip={{ flannel_subnet }} --mtu={{ flannel_mtu }} {% if docker_options is defined %}{{ docker_options }}{% endif %}"