summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-08-30 12:43:53 -0400
committerGitHub <noreply@github.com>2017-08-30 12:43:53 -0400
commitc8134c2d33ce72e2d394ba11becdb908be246456 (patch)
treed2b8989cad444a2748654180c25ea7298513da84
parentb7d2953dcf02ac98828077cdfde2293570f91816 (diff)
parent68c52443ef4b280a902db1c3ce4c7350daa6733a (diff)
downloadopenshift-c8134c2d33ce72e2d394ba11becdb908be246456.tar.gz
openshift-c8134c2d33ce72e2d394ba11becdb908be246456.tar.bz2
openshift-c8134c2d33ce72e2d394ba11becdb908be246456.tar.xz
openshift-c8134c2d33ce72e2d394ba11becdb908be246456.zip
Merge pull request #5252 from mtnbikenc/fix-group-conditional
Merged by openshift-bot
-rw-r--r--playbooks/common/openshift-cluster/evaluate_groups.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/evaluate_groups.yml b/playbooks/common/openshift-cluster/evaluate_groups.yml
index c56b07037..61636a880 100644
--- a/playbooks/common/openshift-cluster/evaluate_groups.yml
+++ b/playbooks/common/openshift-cluster/evaluate_groups.yml
@@ -13,12 +13,12 @@
- name: Evaluate groups - g_master_hosts or g_new_master_hosts required
fail:
msg: This playbook requires g_master_hosts or g_new_master_hosts to be set
- when: g_master_hosts is not defined or g_new_master_hosts is not defined
+ when: g_master_hosts is not defined and g_new_master_hosts is not defined
- name: Evaluate groups - g_node_hosts or g_new_node_hosts required
fail:
msg: This playbook requires g_node_hosts or g_new_node_hosts to be set
- when: g_node_hosts is not defined or g_new_node_hosts is not defined
+ when: g_node_hosts is not defined and g_new_node_hosts is not defined
- name: Evaluate groups - g_lb_hosts required
fail: