Skip to content
Snippets Groups Projects
Commit b74c2f89 authored by Spencer Smith's avatar Spencer Smith
Browse files

lay down a systemd dropin instead of the /run/flannel_docker_opts.env symlink

parent 7ac7fc33
No related branches found
No related tags found
No related merge requests found
...@@ -42,12 +42,14 @@ ...@@ -42,12 +42,14 @@
mode: 0644 mode: 0644
notify: notify:
- restart docker - restart docker
when: ansible_os_family != "CoreOS"
- name: Flannel | Create docker config symlink for CoreOS - name: Flannel | Create docker dropin for CoreOS
file: template:
src: "/etc/default/docker" src: docker-dropin
dest: "/run/flannel_docker_opts.env" dest: "/etc/systemd/system/docker.service.d/flannel-options.conf"
state: link notify:
- restart docker
when: ansible_os_family == "CoreOS" when: ansible_os_family == "CoreOS"
- meta: flush_handlers - meta: flush_handlers
[Service]
Environment="DOCKER_OPTS=--bip={{ flannel_subnet }} --mtu={{ flannel_mtu }} {% if docker_options is defined %}{{ docker_options }}{% endif %}"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment