openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Don't add external tasks for roles with zero count" into stable/wallaby

This commit is contained in:
Zuul 2021-05-21 19:51:10 +00:00 committed by Gerrit Code Review
parent 85d325556a 36c16a189f
commit e0ce8c0143
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
common/deploy-steps.j2
View File

@ -266,7 +266,10 @@ resources:
value: value:
list_concat_unique: list_concat_unique:
{%- for role in enabled_roles %} {%- 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 %} {%- endfor %}
ExternalDeployTasks: ExternalDeployTasks:
@ -276,7 +279,10 @@ resources:
value: value:
list_concat_unique: list_concat_unique:
{%- for role in enabled_roles %} {%- 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 %} {%- endfor %}
ExternalPostDeployTasks: ExternalPostDeployTasks:
@ -286,7 +292,10 @@ resources:
value: value:
list_concat_unique: list_concat_unique:
{%- for role in enabled_roles %} {%- 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 %} {%- endfor %}
ScaleTasks: ScaleTasks:
@ -306,7 +315,10 @@ resources:
value: value:
list_concat_unique: list_concat_unique:
{%- for role in enabled_roles %} {%- 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 %} {%- endfor %}
ExternalUpgradeTasks: ExternalUpgradeTasks:
@ -316,7 +328,10 @@ resources:
value: value:
list_concat_unique: list_concat_unique:
{%- for role in enabled_roles %} {%- 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 %} {%- endfor %}
BootstrapServerId: BootstrapServerId: