diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2015-10-22 13:58:38 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2015-11-04 19:57:21 -0500 |
| commit | 51bcc78aea4015bf23d06b621b57de675b21e7cf (patch) | |
| tree | 820add260d36642b991ee7d6933afdb6ac718018 /roles/openshift_master | |
| parent | 3778662ef816b2bb0a3788ed65229b45622a0139 (diff) | |
| download | openshift-51bcc78aea4015bf23d06b621b57de675b21e7cf.tar.gz openshift-51bcc78aea4015bf23d06b621b57de675b21e7cf.tar.bz2 openshift-51bcc78aea4015bf23d06b621b57de675b21e7cf.tar.xz openshift-51bcc78aea4015bf23d06b621b57de675b21e7cf.zip | |
additional native ha changes
Diffstat (limited to 'roles/openshift_master')
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index abe652bcb..f11582ce7 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -63,6 +63,7 @@ controller_args: "{{ osm_controller_args | default(None) }}" infra_nodes: "{{ num_infra | default(None) }}" disabled_features: "{{ osm_disabled_features | default(None) }}" + master_count: "{{ openshift_master_count | default(None) }}" - name: Install Master package yum: pkg={{ openshift.common.service_type }}-master state=present 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: |