openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Disable role host_prep_tasks on controlplane upgrade"

This commit is contained in:
Jenkins 2017-10-04 02:59:21 +00:00 committed by Gerrit Code Review
parent 8c1ae8b73e 684267a7a4
commit 8feb27ab0d
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/deploy-steps.j2
View File

@ -4,6 +4,9 @@
# On upgrade certain roles can be disabled for operator driven upgrades
# See major_upgrade_steps.j2.yaml and post-upgrade.j2.yaml
{%- set enabled_roles = roles -%}
{%- set is_upgrade = false -%}
{%- else %}
{%- set is_upgrade = true -%}
{%- endif -%}
{%- set primary_role = [enabled_roles[0]] -%}
{%- for role in enabled_roles -%}
@ -189,7 +192,11 @@ resources:
tasks:
# Join host_prep_tasks with the other per-host configuration
list_concat:
{%- if is_upgrade|default(false) and role.disable_upgrade_deployment|default(false) %}
- []
{%- else %}
- {get_param: [role_data, {{role.name}}, host_prep_tasks]}
{%- endif %}
-
{%- raw %}
# Write the manifest for baremetal puppet configuration