Browse Source

1169 - fix docker systemd unit

The docker-network environment file masks the new values
put into /etc/systemd/system/docker.service.d/flannel-options.conf
to renumber the docker0 to work correctly with flannel.
pull/1170/head
Josh Lothian 8 years ago
parent
commit
5e2f78424f
1 changed files with 1 additions and 2 deletions
  1. 3
      roles/docker/templates/docker_atomic.service.j2

3
roles/docker/templates/docker_atomic.service.j2

@ -9,7 +9,6 @@ Type=notify
NotifyAccess=all
EnvironmentFile=-/etc/sysconfig/docker
EnvironmentFile=-/etc/sysconfig/docker-storage
EnvironmentFile=-/etc/sysconfig/docker-network
Environment=GOTRACEBACK=crash
Environment=DOCKER_HTTP_HOST_COMPAT=1
Environment=PATH=/usr/libexec/docker:/usr/bin:/usr/sbin
@ -35,4 +34,4 @@ TimeoutStartSec=1min
Restart=on-abnormal
[Install]
WantedBy=multi-user.target
WantedBy=multi-user.target
Loading…
Cancel
Save