summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-12-03 08:43:21 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-12-03 08:43:21 -0500
commit15aa17c6162c036f6b164f225d2a071c138af965 (patch)
treef4f3c11f28af75f9d40c7aefa7576aa21ccf07c5
parent400c4e2f375fda9e7da292360c300723655b89fa (diff)
parent63b69a9eb20fea3696963d4ce02eea14d5ef4c53 (diff)
downloadopenshift-15aa17c6162c036f6b164f225d2a071c138af965.tar.gz
openshift-15aa17c6162c036f6b164f225d2a071c138af965.tar.bz2
openshift-15aa17c6162c036f6b164f225d2a071c138af965.tar.xz
openshift-15aa17c6162c036f6b164f225d2a071c138af965.zip
Merge pull request #1010 from abutcher/pacemaker-count
Use masterCount=1 with pacemaker ha
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index 9f4a17f0a..cadb02fa3 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -83,7 +83,7 @@ kubernetesMasterConfig:
{% endif %}
apiServerArguments: {{ api_server_args if api_server_args is defined else 'null' }}
controllerArguments: {{ controller_args if controller_args is defined else 'null' }}
- masterCount: {{ openshift.master.master_count }}
+ masterCount: {{ openshift.master.master_count if openshift.master.cluster_method | default(None) == 'native' else 1 }}
masterIP: {{ openshift.common.ip }}
podEvictionTimeout: ""
proxyClientInfo: