summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2016-04-27 16:08:29 -0400
committerJason DeTiberus <detiber@gmail.com>2016-04-27 16:08:29 -0400
commit4c1f13667f68b48572ba24860781e8a6aad19027 (patch)
tree6cdfe5e2a5a81b9094993c4305e26a72e3ee410d
parente84c06b5d25cadb089bdccb89959b3f39f9aabe7 (diff)
parent763014c66c1c932ef5569fbc35d8aece87254317 (diff)
downloadopenshift-4c1f13667f68b48572ba24860781e8a6aad19027.tar.gz
openshift-4c1f13667f68b48572ba24860781e8a6aad19027.tar.bz2
openshift-4c1f13667f68b48572ba24860781e8a6aad19027.tar.xz
openshift-4c1f13667f68b48572ba24860781e8a6aad19027.zip
Merge pull request #1830 from smunilla/BZ1330918
a-o-i: Populate groups for openshift_facts
-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: