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 | |
| parent | 3778662ef816b2bb0a3788ed65229b45622a0139 (diff) | |
| download | openshift-51bcc78aea4015bf23d06b621b57de675b21e7cf.tar.gz openshift-51bcc78aea4015bf23d06b621b57de675b21e7cf.tar.bz2 openshift-51bcc78aea4015bf23d06b621b57de675b21e7cf.tar.xz openshift-51bcc78aea4015bf23d06b621b57de675b21e7cf.zip | |
additional native ha changes
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 10 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 1 | ||||
| -rw-r--r-- | roles/openshift_master/templates/master.yaml.v1.j2 | 3 |
3 files changed, 7 insertions, 7 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 84ce65f48..e5357f6e3 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -239,7 +239,7 @@ named_certificates: "{{ hostvars[groups['oo_first_master'][0]]['parsed_named_certificates'] | default([])}}" sync_tmpdir: "{{ hostvars.localhost.g_master_mktemp.stdout }}" openshift_master_ha: "{{ groups.oo_masters_to_config | length > 1 }}" - embedded_etcd: "{{ openshift.master.embedded_etcd }}" + openshift_master_count: "{{ groups.oo_masters_to_config | length }}" pre_tasks: - name: Ensure certificate directory exists file: @@ -264,11 +264,11 @@ - name: Additional master configuration hosts: oo_first_master vars: - openshift_master_ha: "{{ groups.oo_masters_to_config | length > 1 }}" - omc_cluster_hosts: "{{ groups.oo_masters_to_config | join(' ')}}" + #openshift_master_ha: "{{ groups.oo_masters_to_config | length > 1 }}" + # omc_cluster_hosts: "{{ groups.oo_masters_to_config | join(' ')}}" roles: - - role: openshift_master_cluster - when: openshift_master_ha | bool +# - role: openshift_master_cluster +# when: openshift_master_ha | bool - openshift_examples - role: openshift_cluster_metrics when: openshift.common.use_cluster_metrics | bool 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: |