From 8caaee30a96f71de5e84137e4854bcd92b773f6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Andr=C3=A9?= Date: Fri, 26 Oct 2018 18:38:28 +0200 Subject: [PATCH] Do not include node scale up playbook in case of new masters Openshift-ansible gives us a friendly error when we do: "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" Change-Id: Ibf52b9dbabc9a4f86c11b7de345c3b73e157435c Closes-Bug: #1802324 --- extraconfig/services/openshift-master.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extraconfig/services/openshift-master.yaml b/extraconfig/services/openshift-master.yaml index 44eb18b100..d338d08eed 100644 --- a/extraconfig/services/openshift-master.yaml +++ b/extraconfig/services/openshift-master.yaml @@ -354,13 +354,13 @@ outputs: - include: "{{openshift_prerequisites_playbook_path}}" - {% if tripleo_stack_action == 'UPDATE' and new_master_nodes | count > 0 %} - - include: "{{openshift_master_scaleup_playbook_path}}" - {% endif %} - {% if tripleo_stack_action == 'UPDATE' and has_new_nodes %} + {% if new_master_nodes | count > 0 %} + - include: "{{openshift_master_scaleup_playbook_path}}" + {% else %} - include: "{{openshift_worker_scaleup_playbook_path}}" {% endif %} + {% endif %} {% if tripleo_stack_action == 'UPDATE' and openshift_upgrade %} - include: "{{openshift_upgrade_playbook_path}}"