Merge pull request #745 from kubernetes-incubator/fix_weave_start

Fix weave restart after docker daemon restart

roles/network_plugin/weave/templates/weave.service.j2

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

roles/network_plugin/weave/templates/weaveproxy.service.j2

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