From 36c16a189fc2787b28eb661af2f875331fe44a93 Mon Sep 17 00:00:00 2001
From: ramishra <ramishra@redhat.com>
Date: Wed, 12 May 2021 07:27:22 +0530
Subject: [PATCH] Don't add external tasks for roles with zero count

We don't need to add these tasks for roles with zero
count. We probably should not create service chains for
roles with zero count, but that's a bigger change.

Change-Id: I41c6b4799eef7940b12811468dcc48e7b6fa543b
(cherry picked from commit 7fd0dd5d4b5d98d3f0d887979f892017cd632417)
---
 common/deploy-steps.j2 | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 07683e7d3d..5c2e1c9212 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -266,7 +266,10 @@ resources:
       value:
         list_concat_unique:
         {%- for role in enabled_roles %}
-          - get_param: [role_data, {{role.name}}, pre_deploy_step_tasks]
+          - if:
+              - {{role.name}}NonZero
+              - get_param: [role_data, {{role.name}}, pre_deploy_step_tasks]
+              - []
         {%- endfor %}
 
   ExternalDeployTasks:
@@ -276,7 +279,10 @@ resources:
       value:
         list_concat_unique:
         {%- for role in enabled_roles %}
-          - get_param: [role_data, {{role.name}}, external_deploy_tasks]
+          - if:
+              - {{role.name}}NonZero
+              - get_param: [role_data, {{role.name}}, external_deploy_tasks]
+              - []
         {%- endfor %}
 
   ExternalPostDeployTasks:
@@ -286,7 +292,10 @@ resources:
       value:
         list_concat_unique:
         {%- for role in enabled_roles %}
-          - get_param: [role_data, {{role.name}}, external_post_deploy_tasks]
+          - if:
+              - {{role.name}}NonZero
+              - get_param: [role_data, {{role.name}}, external_post_deploy_tasks]
+              - []
         {%- endfor %}
 
   ScaleTasks:
@@ -306,7 +315,10 @@ resources:
       value:
         list_concat_unique:
         {%- for role in enabled_roles %}
-          - get_param: [role_data, {{role.name}}, external_update_tasks]
+          - if:
+              - {{role.name}}NonZero
+              - get_param: [role_data, {{role.name}}, external_update_tasks]
+              - []
         {%- endfor %}
 
   ExternalUpgradeTasks:
@@ -316,7 +328,10 @@ resources:
       value:
         list_concat_unique:
         {%- for role in enabled_roles %}
-          - get_param: [role_data, {{role.name}}, external_upgrade_tasks]
+          - if:
+              - {{role.name}}NonZero
+              - get_param: [role_data, {{role.name}}, external_upgrade_tasks]
+              - []
         {%- endfor %}
 
   BootstrapServerId: