diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2017-11-16 15:49:17 -0500 |
|---|---|---|
| committer | Russell Teague <rteague@redhat.com> | 2017-12-05 14:02:23 -0500 |
| commit | 259272fa2359fd4d3bd78291bd0b06a1261c4b01 (patch) | |
| tree | d8ea0b2afe7df6c400160c7b2f3870f9e44bc6a8 /roles/openshift_master/templates | |
| parent | 968f614e984da91a4e883a9642af8e66d49d87a0 (diff) | |
| download | openshift-259272fa2359fd4d3bd78291bd0b06a1261c4b01.tar.gz openshift-259272fa2359fd4d3bd78291bd0b06a1261c4b01.tar.bz2 openshift-259272fa2359fd4d3bd78291bd0b06a1261c4b01.tar.xz openshift-259272fa2359fd4d3bd78291bd0b06a1261c4b01.zip | |
Remove all references to pacemaker (pcs, pcsd) and openshift.master.cluster_method.
With pacemaker removed there is no longer a need for
openshift.master.cluster_method. We only have one option.
Diffstat (limited to 'roles/openshift_master/templates')
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 2 |
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 f9f57bc72..92668b227 100644 --- a/roles/openshift_master/templates/master.yaml.v1.j2 +++ b/roles/openshift_master/templates/master.yaml.v1.j2 @@ -120,7 +120,7 @@ kubernetesMasterConfig: - application/vnd.kubernetes.protobuf {% endif %} controllerArguments: {{ openshift.master.controller_args | default(None) | to_padded_yaml( level=2 ) }} - masterCount: {{ openshift.master.master_count if openshift.master.cluster_method | default(None) == 'native' else 1 }} + masterCount: {{ openshift.master.master_count }} masterIP: {{ openshift.common.ip }} podEvictionTimeout: {{ openshift.master.pod_eviction_timeout | default("") }} proxyClientInfo: |