summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-master
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-06-16 20:24:40 -0400
committerGitHub <noreply@github.com>2017-06-16 20:24:40 -0400
commite37c99d056a045aee2e0c4c060fe8b1b2ff1d8bc (patch)
treefacaae1c92f454a14e8ba6fe1ee74b9668709ec0 /playbooks/common/openshift-master
parent7d346c8abe48aeb6affa189e766480c2ef80e73b (diff)
parent09823dc64b1447a0a5a2a57921c74c77705c0b3d (diff)
downloadopenshift-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
Diffstat (limited to 'playbooks/common/openshift-master')
-rw-r--r--playbooks/common/openshift-master/config.yml10
1 files changed, 10 insertions, 0 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