summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorSamuel Munilla <smunilla@redhat.com>2016-04-27 14:30:05 -0400
committerSamuel Munilla <smunilla@redhat.com>2016-04-27 14:36:07 -0400
commit763014c66c1c932ef5569fbc35d8aece87254317 (patch)
tree6583b9ded58c777cf84f00ebfa1f3a820d753057 /playbooks
parent207b5aea8d619acb9622a351f54301c24598b08d (diff)
downloadopenshift-763014c66c1c932ef5569fbc35d8aece87254317.tar.gz
openshift-763014c66c1c932ef5569fbc35d8aece87254317.tar.bz2
openshift-763014c66c1c932ef5569fbc35d8aece87254317.tar.xz
openshift-763014c66c1c932ef5569fbc35d8aece87254317.zip
a-o-i: Populate groups for openshift_facts
openshift_facts is currently failing because it doesn't properly set up groups after the proxy changes we made. This fixes that.
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/byo/openshift_facts.yml10
-rw-r--r--playbooks/common/openshift-cluster/evaluate_groups.yml2
2 files changed, 11 insertions, 1 deletions
diff --git a/playbooks/byo/openshift_facts.yml b/playbooks/byo/openshift_facts.yml
index 916dfd0a6..b694b6c08 100644
--- a/playbooks/byo/openshift_facts.yml
+++ b/playbooks/byo/openshift_facts.yml
@@ -1,4 +1,14 @@
---
+- name: Cluster hosts
+ hosts: localhost
+ connection: local
+ become: no
+ gather_facts: no
+ tasks:
+ - include_vars: openshift-cluster/cluster_hosts.yml
+
+- include: ../common/openshift-cluster/evaluate_groups.yml
+
- name: Gather Cluster facts
hosts: OSEv3
roles:
diff --git a/playbooks/common/openshift-cluster/evaluate_groups.yml b/playbooks/common/openshift-cluster/evaluate_groups.yml
index 3fb42a7fa..c5273b08f 100644
--- a/playbooks/common/openshift-cluster/evaluate_groups.yml
+++ b/playbooks/common/openshift-cluster/evaluate_groups.yml
@@ -35,7 +35,7 @@
groups: oo_all_hosts
ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
ansible_become: "{{ g_sudo | default(omit) }}"
- with_items: "{{ g_all_hosts | default([]) }}"
+ with_items: g_all_hosts | default([])
- name: Evaluate oo_masters
add_host: