Merge pull request #5325 from DenverJ/patch-1

Fix new_master or new_node fail check during scaleup

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