summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-06-18 16:30:23 -0400
committerScott Dodson <sdodson@redhat.com>2017-06-18 20:26:12 -0400
commitd309657b40b71fba2c16aa663397da81e126a2fb (patch)
tree875e910da4f87f77864d6d22be1c66f6c7db873d /playbooks/common
parentd7be27f7f9321099e52b54afcce2308ac1e1671f (diff)
downloadopenshift-d309657b40b71fba2c16aa663397da81e126a2fb.tar.gz
openshift-d309657b40b71fba2c16aa663397da81e126a2fb.tar.bz2
openshift-d309657b40b71fba2c16aa663397da81e126a2fb.tar.xz
openshift-d309657b40b71fba2c16aa663397da81e126a2fb.zip
Preserve etcd3 storage if it's already in use
This would be the case if for instance they'd upgraded and then migrated.
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-master/config.yml15
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