diff options
author | Russell Teague <rteague@redhat.com> | 2017-12-14 10:24:24 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-14 10:24:24 -0500 |
commit | 51a69d758e188b16126cca6f2791e2a00fe6ebad (patch) | |
tree | 486cee3b6a466ede8f1f316cf05146bcf0d3a5d8 | |
parent | a1344ac3d0ded24335d9c82fff92468c6225bdee (diff) | |
parent | e28adead42dd55f23f0421aa054c7419e646b2a9 (diff) | |
download | openshift-51a69d758e188b16126cca6f2791e2a00fe6ebad.tar.gz openshift-51a69d758e188b16126cca6f2791e2a00fe6ebad.tar.bz2 openshift-51a69d758e188b16126cca6f2791e2a00fe6ebad.tar.xz openshift-51a69d758e188b16126cca6f2791e2a00fe6ebad.zip |
Merge pull request #6348 from nbartos/contiv-systemd
Contiv systemd fixes
-rw-r--r-- | roles/contiv/templates/aci-gw.service | 5 | ||||
-rw-r--r-- | roles/contiv/templates/netmaster.service | 5 | ||||
-rw-r--r-- | 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 |