summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/templates
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-12-24 12:05:35 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-12-24 12:05:35 -0500
commitc54ad32e37ff11ae962bbf6bc48d3f5176383bdd (patch)
treeb566ef65f34670cb0def3d8fcf35ac466f567e95 /roles/openshift_master/templates
parent6de7cec289e5d390e6b2fb6d5ba096f55062f625 (diff)
parent6a8f686478b07666dfbf0ce10aac17b1de8902d5 (diff)
downloadopenshift-c54ad32e37ff11ae962bbf6bc48d3f5176383bdd.tar.gz
openshift-c54ad32e37ff11ae962bbf6bc48d3f5176383bdd.tar.bz2
openshift-c54ad32e37ff11ae962bbf6bc48d3f5176383bdd.tar.xz
openshift-c54ad32e37ff11ae962bbf6bc48d3f5176383bdd.zip
Merge pull request #1094 from abutcher/notify
Reset Type=notify for controllers service
Diffstat (limited to 'roles/openshift_master/templates')
-rw-r--r--roles/openshift_master/templates/atomic-openshift-master-controllers.service.j24
1 files changed, 4 insertions, 0 deletions
diff --git a/roles/openshift_master/templates/atomic-openshift-master-controllers.service.j2 b/roles/openshift_master/templates/atomic-openshift-master-controllers.service.j2
index ef0b57ef4..e6e97b24f 100644
--- a/roles/openshift_master/templates/atomic-openshift-master-controllers.service.j2
+++ b/roles/openshift_master/templates/atomic-openshift-master-controllers.service.j2
@@ -7,7 +7,11 @@ Before={{ openshift.common.service_type }}-node.service
Requires=network.target
[Service]
+{% if openshift.common.version_greater_than_3_1_1_or_1_1_1 | bool %}
+Type=notify
+{% else %}
Type=simple
+{% endif %}
EnvironmentFile=/etc/sysconfig/{{ openshift.common.service_type }}-master-controllers
Environment=GOTRACEBACK=crash
ExecStart=/usr/bin/openshift start master controllers --config=${CONFIG_FILE} $OPTIONS