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.

2 files changed, 39 insertions, 10 deletions

diff --git a/playbooks/openshift-master/scaleup.yml b/playbooks/openshift-master/scaleup.yml
index 7d31340a2..09e205afc 100644
--- a/playbooks/openshift-master/scaleup.yml
+++ b/playbooks/openshift-master/scaleup.yml
@@ -1,22 +1,43 @@
 ---
 - import_playbook: ../init/evaluate_groups.yml
 
-- name: Ensure there are new_masters or new_nodes
+- name: Ensure there are new_masters and new_nodes
   hosts: localhost
   connection: local
   gather_facts: no
   tasks:
   - fail:
+      # new_masters must be part of new_nodes as well; otherwise if new_nodes
+      # is not present, oo_nodes_to_config will contain all existing nodes.
       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
-    - g_new_node_hosts | default([]) | length == 0
+        Detected no new_masters and/or no new_nodes in inventory. New
+        masters must be part of both new_masters and new_nodes groups.
+        If you are adding just new_nodes, use the
+        playbooks/openshift-node/scaleup.yml play.
+    when: >
+      g_new_master_hosts | default([]) | length == 0
+      or 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
+- name: Ensure there are new_masters and new_nodes
+  hosts: oo_masters_to_config
+  connection: local
+  gather_facts: no
+  tasks:
+  - fail:
+      # new_masters must be part of new_nodes as well;
+      msg: >
+        Each host in new_masters must also appear in new_nodes
+    when: inventory_hostname not in groups['oo_nodes_to_config']
+
+- import_playbook: ../prerequisites.yml
+  vars:
+    l_scale_up_hosts: "oo_nodes_to_config:oo_masters_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_masters_to_config:oo_nodes_to_config:!oo_first_master"
+    l_openshift_version_check_hosts: "oo_masters_to_config:oo_nodes_to_config"
 
 - import_playbook: private/scaleup.yml
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