C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1170 from jlothian/atomic-docker-network

Browse source 
1169 - fix docker systemd unit
This commit is contained in:
Spencer Smith 2017-03-30 13:13:28 -07:00 committed by GitHub
commit c2a5453f6f
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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