summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-08-18 09:51:22 -0400
committerGitHub <noreply@github.com>2017-08-18 09:51:22 -0400
commitd44838a8ea38aafd262b5d1c2b2127874ac43511 (patch)
treec89a4de30e2d94d9597bca1bbddbdc2f728d314d
parentea491f041a2a93352543bc774052efc9b2cdcac3 (diff)
parenteec2f317cb4ea707f4e528bd7bb6f4e643fb865d (diff)
downloadopenshift-d44838a8ea38aafd262b5d1c2b2127874ac43511.tar.gz
openshift-d44838a8ea38aafd262b5d1c2b2127874ac43511.tar.bz2
openshift-d44838a8ea38aafd262b5d1c2b2127874ac43511.tar.xz
openshift-d44838a8ea38aafd262b5d1c2b2127874ac43511.zip
Merge pull request #4784 from abutcher/noop-scaleup
Fail scaleup configuration when there are no new_nodes or new_masters
-rw-r--r--playbooks/byo/openshift-master/scaleup.yml14
-rw-r--r--playbooks/byo/openshift-node/scaleup.yml13
2 files changed, 27 insertions, 0 deletions
diff --git a/playbooks/byo/openshift-master/scaleup.yml b/playbooks/byo/openshift-master/scaleup.yml
index 8aa07a664..64811e80d 100644
--- a/playbooks/byo/openshift-master/scaleup.yml
+++ b/playbooks/byo/openshift-master/scaleup.yml
@@ -1,6 +1,20 @@
---
- include: ../openshift-cluster/initialize_groups.yml
+- name: Ensure there are new_masters
+ hosts: localhost
+ connection: local
+ become: no
+ gather_facts: no
+ tasks:
+ - fail:
+ msg: >
+ Detected no new_masters or no new_nodes in inventory. Please
+ 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)
+
- include: ../../common/openshift-master/scaleup.yml
vars:
openshift_cluster_id: "{{ cluster_id | default('default') }}"
diff --git a/playbooks/byo/openshift-node/scaleup.yml b/playbooks/byo/openshift-node/scaleup.yml
index c6965fd6f..fda89b1ea 100644
--- a/playbooks/byo/openshift-node/scaleup.yml
+++ b/playbooks/byo/openshift-node/scaleup.yml
@@ -1,6 +1,19 @@
---
- include: ../openshift-cluster/initialize_groups.yml
+- name: Ensure there are new_nodes
+ hosts: localhost
+ connection: local
+ become: no
+ gather_facts: no
+ tasks:
+ - fail:
+ msg: >
+ Detected no new_nodes in inventory. Please add hosts to the
+ new_nodes host group to add nodes.
+ when:
+ - g_new_node_hosts | default([]) | length == 0
+
- include: ../../common/openshift-node/scaleup.yml
vars:
openshift_cluster_id: "{{ cluster_id | default('default') }}"