summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorNick Bartos <flamingo@2thebatcave.com>2017-12-05 08:30:41 +1100
committerNick Bartos <flamingo@2thebatcave.com>2017-12-14 17:44:59 +1100
commite28adead42dd55f23f0421aa054c7419e646b2a9 (patch)
tree2413417d2639f65c9ea46d2207bc8d1893f5328f /roles
parent34f248849d0963403f7939d5b229381374d025a7 (diff)
downloadopenshift-e28adead42dd55f23f0421aa054c7419e646b2a9.tar.gz
openshift-e28adead42dd55f23f0421aa054c7419e646b2a9.tar.bz2
openshift-e28adead42dd55f23f0421aa054c7419e646b2a9.tar.xz
openshift-e28adead42dd55f23f0421aa054c7419e646b2a9.zip
Contiv systemd fixes
Add install section so that enable on reboot works. Make sure services are always restarted if they die.
Diffstat (limited to 'roles')
-rw-r--r--roles/contiv/templates/aci-gw.service5
-rw-r--r--roles/contiv/templates/netmaster.service5
-rw-r--r--roles/contiv/templates/netplugin.service5
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