summaryrefslogtreecommitdiffstats
path: root/playbooks/openshift-node/scaleup.yml
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-22 09:19:16 -0800
committerGitHub <noreply@github.com>2018-01-22 09:19:16 -0800
commit9dc31f10b113cb0ceab1ba992ad2609da140ba6f (patch)
tree12d9a72fccc2882ef19b34fe8ce15fa76f1e48d5 /playbooks/openshift-node/scaleup.yml
parent4d93123e9626657e55ce03cb8a0288a6ba5e3f2e (diff)
parent682ddb8744af07939c39699f223cc6455bdece01 (diff)
downloadopenshift-9dc31f10b113cb0ceab1ba992ad2609da140ba6f.tar.gz
openshift-9dc31f10b113cb0ceab1ba992ad2609da140ba6f.tar.bz2
openshift-9dc31f10b113cb0ceab1ba992ad2609da140ba6f.tar.xz
openshift-9dc31f10b113cb0ceab1ba992ad2609da140ba6f.zip
Merge pull request #6793 from mgugino-upstream-stage/fix-master-scaleup
Automatic merge from submit-queue. Fix master scaleup This commit builds off https://github.com/openshift/openshift-ansible/pull/6784 Enables openshift-master/scaleup.yml to call prerequisites.yml as required. Also modifies some failure conditions around how scaleup plays are called to ensure inventories are better aligned with playbook behavior.
Diffstat (limited to 'playbooks/openshift-node/scaleup.yml')
-rw-r--r--playbooks/openshift-node/scaleup.yml8
1 files changed, 8 insertions, 0 deletions
diff --git a/playbooks/openshift-node/scaleup.yml b/playbooks/openshift-node/scaleup.yml
index cc03b72a2..9cc7263b7 100644
--- a/playbooks/openshift-node/scaleup.yml
+++ b/playbooks/openshift-node/scaleup.yml
@@ -12,6 +12,14 @@
new_nodes host group to add nodes.
when:
- g_new_node_hosts | default([]) | length == 0
+ - fail:
+ msg: >
+ Please run playbooks/openshift-master/scaleup.yml if you need to
+ scale up both masters and nodes. This playbook is only needed if
+ you are only adding new nodes and not new masters.
+ when:
+ - g_new_node_hosts | default([]) | length > 0
+ - g_new_master_hosts | default([]) | length > 0
# if g_new_node_hosts is not empty, oo_nodes_to_config will be set to
# g_new_node_hosts via evaluate_groups.yml