summaryrefslogtreecommitdiffstats
path: root/playbooks/openshift-node
diff options
context:
space:
mode:
authorMichael Gugino <gugino.michael@yahoo.com>2018-01-19 17:21:46 -0500
committerGitHub <noreply@github.com>2018-01-19 17:21:46 -0500
commit3c1eba1488e1d3570320381ee5eee6ea760e7659 (patch)
treedee97878b906bd8ceea20ee2af9737a422d7254c /playbooks/openshift-node
parent7ad419c31b79c85d610143f95777040db4b5b1b7 (diff)
parent6646d0275739585f5c1ad59e6b27c01fbc374e02 (diff)
downloadopenshift-3c1eba1488e1d3570320381ee5eee6ea760e7659.tar.gz
openshift-3c1eba1488e1d3570320381ee5eee6ea760e7659.tar.bz2
openshift-3c1eba1488e1d3570320381ee5eee6ea760e7659.tar.xz
openshift-3c1eba1488e1d3570320381ee5eee6ea760e7659.zip
Merge pull request #6784 from mgugino-upstream-stage/fix-node-scaleup
Fix node scaleup plays
Diffstat (limited to 'playbooks/openshift-node')
-rw-r--r--playbooks/openshift-node/scaleup.yml16
1 files changed, 13 insertions, 3 deletions
diff --git a/playbooks/openshift-node/scaleup.yml b/playbooks/openshift-node/scaleup.yml
index cf13692ae..cc03b72a2 100644
--- a/playbooks/openshift-node/scaleup.yml
+++ b/playbooks/openshift-node/scaleup.yml
@@ -13,8 +13,18 @@
when:
- g_new_node_hosts | default([]) | length == 0
-# Need a better way to do the above check for node without
-# running evaluate_groups and init/main.yml
-- import_playbook: ../init/main.yml
+# if g_new_node_hosts is not empty, oo_nodes_to_config will be set to
+# g_new_node_hosts via evaluate_groups.yml
+
+- import_playbook: ../prerequisites.yml
+ vars:
+ l_scale_up_hosts: "oo_nodes_to_config"
+ l_init_fact_hosts: "oo_masters_to_config:oo_etcd_to_config:oo_lb_to_config:oo_nodes_to_config"
+ l_sanity_check_hosts: "{{ groups['oo_nodes_to_config'] | union(groups['oo_masters_to_config']) }}"
+
+- import_playbook: ../init/version.yml
+ vars:
+ l_openshift_version_set_hosts: "oo_nodes_to_config:!oo_first_master"
+ l_openshift_version_check_hosts: "oo_nodes_to_config"
- import_playbook: private/config.yml