summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-11-13 15:48:18 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2015-11-13 15:48:18 -0500
commit269bbc57817ad026b9bb2ca25eaddb08f9f60bd8 (patch)
tree71d70eb05ed8923ad6150c7aafdcbecdff9e9636 /playbooks/common
parent9bb9a9877420b0110c573226050d0766dd781618 (diff)
parent61adeef4c94eada5182539cf30c55c4b31534bf9 (diff)
downloadopenshift-269bbc57817ad026b9bb2ca25eaddb08f9f60bd8.tar.gz
openshift-269bbc57817ad026b9bb2ca25eaddb08f9f60bd8.tar.bz2
openshift-269bbc57817ad026b9bb2ca25eaddb08f9f60bd8.tar.xz
openshift-269bbc57817ad026b9bb2ca25eaddb08f9f60bd8.zip
Merge pull request #893 from detiber/etcdFacts
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 b6ca0c2bb..c9cd438f1 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 }}"