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

Merge pull request #745 from kubernetes-incubator/fix_weave_start

Browse source 
Fix weave restart after docker daemon restart
This commit is contained in:
Bogdan Dobrelya 2016-12-16 14:06:48 +01:00 committed by GitHub
commit fc2f616f94
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
roles/network_plugin/weave/templates/weave.service.j2
View file

@ -6,11 +6,12 @@ After=docker.service docker.socket
[Service] [Service]
EnvironmentFile=-/etc/weave.env EnvironmentFile=-/etc/weave.env
ExecStartPre=-/usr/bin/docker rm -f weave
ExecStartPre={{ bin_dir }}/weave launch-router \ ExecStartPre={{ bin_dir }}/weave launch-router \
$WEAVE_SUBNET \ $WEAVE_SUBNET \
$WEAVE_PEERS $WEAVE_PEERS
ExecStart=/usr/bin/docker attach weave ExecStart=/usr/bin/docker attach weave
ExecStop={{ bin_dir }}/weave stop-router ExecStop={{ bin_dir }}/weave stop
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

1
roles/network_plugin/weave/templates/weaveproxy.service.j2
View file

@ -7,6 +7,7 @@ After=docker.service docker.socket
[Service] [Service]
EnvironmentFile=-/etc/weave.%H.env EnvironmentFile=-/etc/weave.%H.env
EnvironmentFile=-/etc/weave.env EnvironmentFile=-/etc/weave.env
ExecStartPre=-/usr/bin/docker rm -f weaveproxy
ExecStartPre={{ bin_dir }}/weave launch-proxy $WEAVEPROXY_ARGS ExecStartPre={{ bin_dir }}/weave launch-proxy $WEAVEPROXY_ARGS
ExecStart=/usr/bin/docker attach weaveproxy ExecStart=/usr/bin/docker attach weaveproxy
Restart=on-failure Restart=on-failure