summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2015-11-13 14:55:01 -0500
committerJason DeTiberus <jdetiber@redhat.com>2015-11-13 14:55:01 -0500
commit133bea98b62718fbc23d3c1f74e22665b5293603 (patch)
tree1ea996e876146bb81d1d41482cb83a207aebf480 /playbooks/common
parent204089c95b8fb784f7d936ed98ed73011da4b6b3 (diff)
downloadopenshift-133bea98b62718fbc23d3c1f74e22665b5293603.tar.gz
openshift-133bea98b62718fbc23d3c1f74e22665b5293603.tar.bz2
openshift-133bea98b62718fbc23d3c1f74e22665b5293603.tar.xz
openshift-133bea98b62718fbc23d3c1f74e22665b5293603.zip
Update etcd default facts setting
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml1
-rw-r--r--playbooks/common/openshift-master/config.yml3
2 files changed, 1 insertions, 3 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
index 78797f8b8..01415f3de 100644
--- a/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
+++ b/playbooks/common/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml
@@ -90,6 +90,7 @@
roles:
- openshift_facts
tasks:
+ # Ensure we persist the etcd role for this host in openshift_facts
- openshift_facts:
role: etcd
local_facts: {}
diff --git a/playbooks/common/openshift-master/config.yml b/playbooks/common/openshift-master/config.yml
index 1b3fba3aa..b1da85d5d 100644
--- a/playbooks/common/openshift-master/config.yml
+++ b/playbooks/common/openshift-master/config.yml
@@ -51,9 +51,6 @@
console_url: "{{ openshift_master_console_url | default(None) }}"
console_use_ssl: "{{ openshift_master_console_use_ssl | default(None) }}"
public_console_url: "{{ openshift_master_public_console_url | default(None) }}"
- - role: etcd
- local_facts: {}
- when: openshift.master.embedded_etcd | bool
- name: Check status of external etcd certificatees
stat:
path: "{{ openshift.common.config_base }}/master/{{ item }}"