summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2015-07-28 08:55:48 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2015-07-28 08:55:48 -0400
commitc70156e34fe34022319d329d93c470e9b11beade (patch)
tree195fe20f9c40b1fb42396560cbd6202f72b37d48 /playbooks/common
parentac8c31c8f34357f52fc25444d0518a10e7193934 (diff)
parent80b9777e9de93bf77666bd5d921cfb128c67ba53 (diff)
downloadopenshift-c70156e34fe34022319d329d93c470e9b11beade.tar.gz
openshift-c70156e34fe34022319d329d93c470e9b11beade.tar.bz2
openshift-c70156e34fe34022319d329d93c470e9b11beade.tar.xz
openshift-c70156e34fe34022319d329d93c470e9b11beade.zip
Merging in the latest fix from OSE
Diffstat (limited to 'playbooks/common')
-rw-r--r--playbooks/common/openshift-cluster/config.yml9
1 files changed, 9 insertions, 0 deletions
diff --git a/playbooks/common/openshift-cluster/config.yml b/playbooks/common/openshift-cluster/config.yml
index 0779cfe47..4c74f96db 100644
--- a/playbooks/common/openshift-cluster/config.yml
+++ b/playbooks/common/openshift-cluster/config.yml
@@ -39,6 +39,15 @@
ansible_sudo: "{{ g_sudo | default(omit) }}"
with_items: groups[g_nodes_group] | default([])
+ - name: Evaluate oo_nodes_to_config
+ add_host:
+ name: "{{ item }}"
+ groups: oo_nodes_to_config
+ ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
+ ansible_sudo: "{{ g_sudo | default(omit) }}"
+ with_items: groups[g_masters_group] | default([])
+ when: g_nodeonmaster is defined and g_nodeonmaster == true
+
- name: Evaluate oo_first_etcd
add_host:
name: "{{ groups[g_etcd_group][0] }}"