Calico systemd unit improvement (status, stop)

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