Merge pull request #6348 from nbartos/contiv-systemd

Contiv systemd fixes

roles/contiv/templates/aci-gw.service

@@ -6,5 +6,8 @@ After=auditd.service systemd-user-sessions.service time-sync.target {{ openshift
 ExecStart={{ bin_dir }}/aci_gw.sh start
 ExecStop={{ bin_dir }}/aci_gw.sh stop
 KillMode=control-group
-Restart=on-failure
+Restart=always
 RestartSec=10
+
+[Install]
+WantedBy=multi-user.target

roles/contiv/templates/netmaster.service

@@ -6,5 +6,8 @@ After=auditd.service systemd-user-sessions.service contiv-etcd.service
 EnvironmentFile=/etc/default/netmaster
 ExecStart={{ bin_dir }}/netmaster $NETMASTER_ARGS
 KillMode=control-group
-Restart=on-failure
+Restart=always
 RestartSec=10
+
+[Install]
+WantedBy=multi-user.target

roles/contiv/templates/netplugin.service

@@ -6,3 +6,8 @@ After=auditd.service systemd-user-sessions.service contiv-etcd.service
 EnvironmentFile=/etc/default/netplugin
 ExecStart={{ bin_dir }}/netplugin $NETPLUGIN_ARGS
 KillMode=control-group
+Restart=always
+RestartSec=10
+
+[Install]
+WantedBy=multi-user.target