From e28adead42dd55f23f0421aa054c7419e646b2a9 Mon Sep 17 00:00:00 2001
From: Nick Bartos <flamingo@2thebatcave.com>
Date: Tue, 5 Dec 2017 08:30:41 +1100
Subject: Contiv systemd fixes

Add install section so that enable on reboot works.
Make sure services are always restarted if they die.
---
 roles/contiv/templates/aci-gw.service    | 5 ++++-
 roles/contiv/templates/netmaster.service | 5 ++++-
 roles/contiv/templates/netplugin.service | 5 +++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/roles/contiv/templates/aci-gw.service b/roles/contiv/templates/aci-gw.service
index 90bb98001..9b3f12567 100644
--- a/roles/contiv/templates/aci-gw.service
+++ b/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
diff --git a/roles/contiv/templates/netmaster.service b/roles/contiv/templates/netmaster.service
index a602c955e..ce7d0c75e 100644
--- a/roles/contiv/templates/netmaster.service
+++ b/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
diff --git a/roles/contiv/templates/netplugin.service b/roles/contiv/templates/netplugin.service
index dc7b95bb5..6358d89ec 100644
--- a/roles/contiv/templates/netplugin.service
+++ b/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
-- 
cgit v1.2.3