summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/templates
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2015-12-18 15:03:16 -0500
committerAndrew Butcher <abutcher@redhat.com>2015-12-18 15:59:18 -0500
commit6a8f686478b07666dfbf0ce10aac17b1de8902d5 (patch)
treefe43715bbcb5af487053992068079ebea3f9237a /roles/openshift_master/templates
parent0d6cc805ad7ada87c5c39eec518b42b99f1e31f0 (diff)
downloadopenshift-6a8f686478b07666dfbf0ce10aac17b1de8902d5.tar.gz
openshift-6a8f686478b07666dfbf0ce10aac17b1de8902d5.tar.bz2
openshift-6a8f686478b07666dfbf0ce10aac17b1de8902d5.tar.xz
openshift-6a8f686478b07666dfbf0ce10aac17b1de8902d5.zip
Conditionalize for 3.1.1/1.1.1
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 8952c86ef..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