summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason DeTiberus <detiber@gmail.com>2016-08-19 14:06:32 -0400
committerGitHub <noreply@github.com>2016-08-19 14:06:32 -0400
commit48e187e22207e395f742eee541f47f5a0153a25b (patch)
tree7d8d3f932cea895aecc94540ba03c2040f0c3fc9
parent1dcf0cfda76b8adea076f98c55da4ba147e512df (diff)
parentbce3235761a16fd8048760ce8ee63e0a64d672a7 (diff)
downloadopenshift-48e187e22207e395f742eee541f47f5a0153a25b.tar.gz
openshift-48e187e22207e395f742eee541f47f5a0153a25b.tar.bz2
openshift-48e187e22207e395f742eee541f47f5a0153a25b.tar.xz
openshift-48e187e22207e395f742eee541f47f5a0153a25b.zip
Merge pull request #2329 from lhuard1A/fix_nodeonmaster
Fix the “node on master” feature
-rw-r--r--playbooks/common/openshift-cluster/evaluate_groups.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/playbooks/common/openshift-cluster/evaluate_groups.yml b/playbooks/common/openshift-cluster/evaluate_groups.yml
index 3fb42a7fa..b3e02fb97 100644
--- a/playbooks/common/openshift-cluster/evaluate_groups.yml
+++ b/playbooks/common/openshift-cluster/evaluate_groups.yml
@@ -77,7 +77,7 @@
ansible_ssh_user: "{{ g_ssh_user | default(omit) }}"
ansible_become: "{{ g_sudo | default(omit) }}"
with_items: "{{ g_master_hosts | default([]) }}"
- when: g_nodeonmaster | default(false) == true and g_new_node_hosts is not defined
+ when: g_nodeonmaster | default(false) | bool and not g_new_node_hosts | default(false) | bool
- name: Evaluate oo_first_etcd
add_host: