summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/templates
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2015-10-22 13:58:38 -0400
committerAndrew Butcher <abutcher@redhat.com>2015-11-04 19:57:21 -0500
commit51bcc78aea4015bf23d06b621b57de675b21e7cf (patch)
tree820add260d36642b991ee7d6933afdb6ac718018 /roles/openshift_master/templates
parent3778662ef816b2bb0a3788ed65229b45622a0139 (diff)
downloadopenshift-51bcc78aea4015bf23d06b621b57de675b21e7cf.tar.gz
openshift-51bcc78aea4015bf23d06b621b57de675b21e7cf.tar.bz2
openshift-51bcc78aea4015bf23d06b621b57de675b21e7cf.tar.xz
openshift-51bcc78aea4015bf23d06b621b57de675b21e7cf.zip
additional native ha changes
Diffstat (limited to 'roles/openshift_master/templates')
-rw-r--r--roles/openshift_master/templates/master.yaml.v1.j23
1 files changed, 1 insertions, 2 deletions
diff --git a/roles/openshift_master/templates/master.yaml.v1.j2 b/roles/openshift_master/templates/master.yaml.v1.j2
index 9547a6945..877c44772 100644
--- a/roles/openshift_master/templates/master.yaml.v1.j2
+++ b/roles/openshift_master/templates/master.yaml.v1.j2
@@ -80,8 +80,7 @@ kubernetesMasterConfig:
- v1
apiServerArguments: {{ api_server_args if api_server_args is defined else 'null' }}
controllerArguments: {{ controller_args if controller_args is defined else 'null' }}
-{# TODO: support overriding masterCount #}
- masterCount: 1
+ masterCount: {{ openshift.master.master_count }}
masterIP: ""
podEvictionTimeout: ""
proxyClientInfo: