summaryrefslogtreecommitdiffstats
path: root/playbooks/common
diff options
context:
space:
mode:
authorWesley Hearn <wesley.s.hearn@gmail.com>2015-07-27 16:32:11 -0400
committerWesley Hearn <wesley.s.hearn@gmail.com>2015-07-27 16:32:11 -0400
commit80b9777e9de93bf77666bd5d921cfb128c67ba53 (patch)
treed109d1f00b35755993e14c2e13323e49772b1241 /playbooks/common
parent274aa30b1af218031c0c6e7d3abe2ab732dc5b59 (diff)
parent8bdaac7f60a5826b8e8518a6f8ded737bd713f82 (diff)
downloadopenshift-80b9777e9de93bf77666bd5d921cfb128c67ba53.tar.gz
openshift-80b9777e9de93bf77666bd5d921cfb128c67ba53.tar.bz2
openshift-80b9777e9de93bf77666bd5d921cfb128c67ba53.tar.xz
openshift-80b9777e9de93bf77666bd5d921cfb128c67ba53.zip
Merge pull request #397 from wshearn/master_as_node
Setup openshift-node on the masters
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] }}"