diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-19 15:18:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-19 15:18:02 -0400 |
| commit | fabc141055b93d541701c82ce71d31a0a1d1bb6f (patch) | |
| tree | 519e0c04df4dd5bebab8ab6dc70b6d13ae77e014 /playbooks/common | |
| parent | 326d8e530db5f0cfcbc1a77451150699063e900e (diff) | |
| parent | d309657b40b71fba2c16aa663397da81e126a2fb (diff) | |
| download | openshift-fabc141055b93d541701c82ce71d31a0a1d1bb6f.tar.gz openshift-fabc141055b93d541701c82ce71d31a0a1d1bb6f.tar.bz2 openshift-fabc141055b93d541701c82ce71d31a0a1d1bb6f.tar.xz openshift-fabc141055b93d541701c82ce71d31a0a1d1bb6f.zip | |
Merge pull request #4486 from sdodson/etcdv3-clean-install
Merged by openshift-bot
Diffstat (limited to 'playbooks/common')
| -rw-r--r-- | playbooks/common/openshift-master/config.yml | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml index 429460b2c..70108fb7a 100644 --- a/playbooks/common/openshift-master/config.yml +++ b/playbooks/common/openshift-master/config.yml @@ -27,7 +27,17 @@ - name: Set clean install fact set_fact: - l_clean_install: "{{ not master_config_stat.stat.exists }}" + l_clean_install: "{{ not master_config_stat.stat.exists | bool }}" + + - name: Determine if etcd3 storage is in use + command: grep -Pzo "storage-backend:\n.*etcd3" /etc/origin/master/master-config.yaml -q + register: etcd3_grep + failed_when: false + changed_when: false + + - name: Set etcd3 fact + set_fact: + l_etcd3_enabled: "{{ etcd3_grep.rc == 0 | bool }}" - set_fact: openshift_master_pod_eviction_timeout: "{{ lookup('oo_option', 'openshift_master_pod_eviction_timeout') | default(none, true) }}" @@ -131,7 +141,8 @@ 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 + r_openshift_master_clean_install: "{{ hostvars[groups.oo_first_master.0].l_clean_install }}" + r_openshift_master_etcd3_storage: "{{ hostvars[groups.oo_first_master.0].l_etcd3_enabled }}" - role: nuage_master when: openshift.common.use_nuage | bool - role: calico_master |