From 795ce8468dbcf01c42e58f3d8a4de2821593a7ce Mon Sep 17 00:00:00 2001
From: Smaine Kahlouch <smaine.kahlouch@arkena.com>
Date: Sat, 21 Nov 2015 13:20:39 +0100
Subject: [PATCH] Calico systemd unit improvement (status, stop)

---
 .../templates/calico/calico-node.service.j2       | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/roles/network_plugin/templates/calico/calico-node.service.j2 b/roles/network_plugin/templates/calico/calico-node.service.j2
index 18fc77006..d4083afa8 100644
--- a/roles/network_plugin/templates/calico/calico-node.service.j2
+++ b/roles/network_plugin/templates/calico/calico-node.service.j2
@@ -1,19 +1,20 @@
 [Unit]
-Description=calicoctl node
-After=etcd2.service
+Description=Calico per-node agent
+Documentation=https://github.com/projectcalico/calico-docker
+Requires=docker.service
+After=docker.service etcd2.service
 
 [Service]
 EnvironmentFile=/etc/network-environment
 User=root
 PermissionsStartOnly=true
 {%    if peer_with_router|default(false) %}
-ExecStart={{ bin_dir }}/calicoctl node --kubernetes --ip=${DEFAULT_IPV4} --as={{ local_as }}
+ExecStart={{ bin_dir }}/calicoctl node --kubernetes --ip=${DEFAULT_IPV4} --as={{ local_as }} --detach=false
 {%     else %}
-ExecStart={{ bin_dir }}/calicoctl node --kubernetes --ip=${DEFAULT_IPV4}
+ExecStart={{ bin_dir }}/calicoctl node --kubernetes --ip=${DEFAULT_IPV4} --detach=false
 {%     endif %}
-
-RemainAfterExit=yes
-Type=oneshot
+Restart=always
+Restart=10
 
 [Install]
 WantedBy=multi-user.target