summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-09-12 11:01:12 -0400
committerGitHub <noreply@github.com>2017-09-12 11:01:12 -0400
commitf8393b7aef78c92437fe78092821a8d0a11c22cc (patch)
tree16cde5c74ddc9e8a997708154531fd998523711d
parentf4a328ad2dc1d1ba93efa15ac0bf4502bad40079 (diff)
parent02bc3db0342cc924a389a6ed7598c8a6665c82c9 (diff)
downloadopenshift-f8393b7aef78c92437fe78092821a8d0a11c22cc.tar.gz
openshift-f8393b7aef78c92437fe78092821a8d0a11c22cc.tar.bz2
openshift-f8393b7aef78c92437fe78092821a8d0a11c22cc.tar.xz
openshift-f8393b7aef78c92437fe78092821a8d0a11c22cc.zip
Merge pull request #5325 from DenverJ/patch-1
Fix new_master or new_node fail check during scaleup
-rw-r--r--playbooks/byo/openshift-master/scaleup.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/byo/openshift-master/scaleup.yml b/playbooks/byo/openshift-master/scaleup.yml
index 2179d1416..a09edd55a 100644
--- a/playbooks/byo/openshift-master/scaleup.yml
+++ b/playbooks/byo/openshift-master/scaleup.yml
@@ -1,7 +1,7 @@
---
- include: ../openshift-cluster/initialize_groups.yml
-- name: Ensure there are new_masters
+- name: Ensure there are new_masters or new_nodes
hosts: localhost
connection: local
become: no
@@ -13,7 +13,7 @@
add hosts to the new_masters and new_nodes host groups to add
masters.
when:
- - (g_new_master_hosts | default([]) | length == 0) or (g_new_node_hosts | default([]) | length == 0)
+ - (g_new_master_hosts | default([]) | length == 0) and (g_new_node_hosts | default([]) | length == 0)
- include: ../../common/openshift-cluster/std_include.yml