summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-10-27 13:12:12 -0400
committerGitHub <noreply@github.com>2016-10-27 13:12:12 -0400
commitc2328b5d7b71a99bd6051ebecd8b6d297be97712 (patch)
tree287c6111ce2fd44fd67001f9aa9af435a73fb88e
parentcab68138cd264b9a4cb5dad9801a42ee50e1bc9b (diff)
parent9fa52e46fadb251be7fc6b07a2be8a153c3fc2fd (diff)
downloadopenshift-c2328b5d7b71a99bd6051ebecd8b6d297be97712.tar.gz
openshift-c2328b5d7b71a99bd6051ebecd8b6d297be97712.tar.bz2
openshift-c2328b5d7b71a99bd6051ebecd8b6d297be97712.tar.xz
openshift-c2328b5d7b71a99bd6051ebecd8b6d297be97712.zip
Merge pull request #2669 from dgoodwin/restart-ha-controllers-always
Change HA master controller service to restart always.
-rw-r--r--roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j22
-rw-r--r--roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j22
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2 b/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2
index a8f5d7351..088e8db43 100644
--- a/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2
+++ b/roles/openshift_master/templates/docker-cluster/atomic-openshift-master-controllers.service.j2
@@ -18,7 +18,7 @@ LimitNOFILE=131072
LimitCORE=infinity
WorkingDirectory={{ openshift.common.data_dir }}
SyslogIdentifier={{ openshift.common.service_type }}-master-controllers
-Restart=on-failure
+Restart=always
RestartSec=5s
[Install]
diff --git a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2 b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2
index bf62696f0..94928f88c 100644
--- a/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2
+++ b/roles/openshift_master/templates/native-cluster/atomic-openshift-master-controllers.service.j2
@@ -19,7 +19,7 @@ LimitNOFILE=131072
LimitCORE=infinity
WorkingDirectory={{ openshift.common.data_dir }}
SyslogIdentifier={{ openshift.common.service_type }}-master-controllers
-Restart=on-failure
+Restart=always
RestartSec=5s
[Install]