summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-etcd
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2016-03-15 03:20:11 -0400
committerJason DeTiberus <jdetiber@redhat.com>2016-03-15 05:04:09 -0400
commit9700b7b66789f300bbe99743719ca699457b3b91 (patch)
treed4f0237240248580a9d842b0506e1226ad78125b /playbooks/common/openshift-etcd
parentc633ce7b8707f311763fa4b707f1ea159265c7d4 (diff)
downloadopenshift-9700b7b66789f300bbe99743719ca699457b3b91.tar.gz
openshift-9700b7b66789f300bbe99743719ca699457b3b91.tar.bz2
openshift-9700b7b66789f300bbe99743719ca699457b3b91.tar.xz
openshift-9700b7b66789f300bbe99743719ca699457b3b91.zip
Move common common facts to openshift_facts
- Prevents roles that need common facts from needing to require openshift_common, which pulls in the openshift binary. - Add dependency on openshift_facts to os_firewall, since it uses openshift.common facts
Diffstat (limited to 'playbooks/common/openshift-etcd')
-rw-r--r--playbooks/common/openshift-etcd/config.yml14
1 files changed, 3 insertions, 11 deletions
diff --git a/playbooks/common/openshift-etcd/config.yml b/playbooks/common/openshift-etcd/config.yml
index 65a5bf20c..06fbd6862 100644
--- a/playbooks/common/openshift-etcd/config.yml
+++ b/playbooks/common/openshift-etcd/config.yml
@@ -5,17 +5,9 @@
- openshift_facts
tasks:
- openshift_facts:
- role: "{{ item.role }}"
- local_facts: "{{ item.local_facts }}"
- with_items:
- - role: common
- local_facts:
- hostname: "{{ openshift_hostname | default(None) }}"
- public_hostname: "{{ openshift_public_hostname | default(None) }}"
- deployment_type: "{{ openshift_deployment_type }}"
- - role: etcd
- local_facts:
- etcd_image: "{{ osm_etcd_image | default(None) }}"
+ role: etcd
+ local_facts:
+ etcd_image: "{{ osm_etcd_image | default(None) }}"
- name: Check status of etcd certificates
stat:
path: "{{ item }}"