X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=common%2Fdeploy-steps.j2;h=a1bd8826501c0ac28a4d909b8186f91aaee569ab;hb=02dffd2da7a0d9e4a8c00686747f157583291c3f;hp=2399b2435710cdc244fc449e042ee66419db79e4;hpb=c7691a1e97a448848d209db3bb0ddd5fe1069669;p=apex-tripleo-heat-templates.git

diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index 2399b243..a1bd8826 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -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
@@ -363,8 +370,3 @@ outputs:
               with_sequence: start=0 end={{upgrade_steps_max-1}}
               loop_control:
                 loop_var: step
-            - include: deploy_steps_tasks.yaml
-              with_sequence: start=0 end={{deploy_steps_max-1}}
-              loop_control:
-                loop_var: step
-