diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-16 20:24:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-16 20:24:40 -0400 |
| commit | e37c99d056a045aee2e0c4c060fe8b1b2ff1d8bc (patch) | |
| tree | facaae1c92f454a14e8ba6fe1ee74b9668709ec0 | |
| parent | 7d346c8abe48aeb6affa189e766480c2ef80e73b (diff) | |
| parent | 09823dc64b1447a0a5a2a57921c74c77705c0b3d (diff) | |
| download | openshift-e37c99d056a045aee2e0c4c060fe8b1b2ff1d8bc.tar.gz openshift-e37c99d056a045aee2e0c4c060fe8b1b2ff1d8bc.tar.bz2 openshift-e37c99d056a045aee2e0c4c060fe8b1b2ff1d8bc.tar.xz openshift-e37c99d056a045aee2e0c4c060fe8b1b2ff1d8bc.zip | |
Merge pull request #4435 from sdodson/etcdv3-clean-install
Merged by openshift-bot
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 10 | ||||
| -rw-r--r-- | roles/openshift_master/defaults/main.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/main.yml | 20 |
3 files changed, 31 insertions, 2 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index ddc4db8f8..429460b2c 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -20,6 +20,15 @@ - node - .config_managed + - name: Check for existing configuration + stat: + path: /etc/origin/master/master-config.yaml + register: master_config_stat + + - name: Set clean install fact + set_fact: + l_clean_install: "{{ not master_config_stat.stat.exists }}" + - set_fact: openshift_master_pod_eviction_timeout: "{{ lookup('oo_option', 'openshift_master_pod_eviction_timeout') | default(none, true) }}" when: openshift_master_pod_eviction_timeout is not defined @@ -122,6 +131,7 @@ etcd_cert_subdir: "openshift-master-{{ openshift.common.hostname }}" etcd_cert_config_dir: "{{ openshift.common.config_base }}/master" etcd_cert_prefix: "master.etcd-" + r_openshift_master_clean_install: hostvars[groups.oo_first_master.0].l_clean_install - role: nuage_master when: openshift.common.use_nuage | bool - role: calico_master diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml index 14a1daf6c..6a082d71a 100644 --- a/roles/openshift_master/defaults/main.yml +++ b/roles/openshift_master/defaults/main.yml @@ -1,4 +1,3 @@ --- openshift_node_ips: [] -# TODO: update setting these values based on the facts -#openshift_version: "{{ openshift_pkg_version | default(openshift_image_tag | default(openshift.docker.openshift_image_tag | default(''))) }}" +r_openshift_master_clean_install: false diff --git a/roles/openshift_master/tasks/main.yml b/roles/openshift_master/tasks/main.yml index aed5598c0..035c15fef 100644 --- a/roles/openshift_master/tasks/main.yml +++ b/roles/openshift_master/tasks/main.yml @@ -164,6 +164,26 @@ - restart master api - restart master controllers +- name: Configure master to use etcd3 storage backend on 3.6 clean installs + yedit: + src: /etc/origin/master/master-config.yaml + key: "{{ item.key }}" + value: "{{ item.value }}" + with_items: + - key: kubernetesMasterConfig.apiServerArguments.storage-backend + value: + - etcd3 + - key: kubernetesMasterConfig.apiServerArguments.storage-media-type + value: + - application/vnd.kubernetes.protobuf + when: + - r_openshift_master_clean_install + - openshift.common.version_gte_3_6 + notify: + - restart master + - restart master api + - restart master controllers + - include: set_loopback_context.yml when: openshift.common.version_gte_3_2_or_1_2 |