X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fdeploy-steps.j2;h=5c923a99bdaf13ad75e1252e170753141b03a61f;hb=7d8b3c4ed61a441ab1b44683d82b080ce4db988e;hp=c076a09d1f21cea2ae0bd652219e8414e90df5d9;hpb=20eb186ea58c7545b0467ed555eedd878c325a21;p=apex-tripleo-heat-templates.git

diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index c076a09d..5c923a99 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 -%}
@@ -45,6 +48,10 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  ConfigDebug:
+    default: false
+    description: Whether to run config management (e.g. Puppet) in debug mode.
+    type: boolean
   DockerPuppetDebug:
     type: string
     default: ''
@@ -82,6 +89,7 @@ resources:
         - name: role_name
         - name: update_identifier
         - name: bootstrap_server_id
+        - name: enable_debug
         - name: docker_puppet_debug
         - name: docker_puppet_process_count
       config:
@@ -189,7 +197,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
@@ -284,6 +296,7 @@ resources:
         role_name: {{role.name}}
         update_identifier: {get_param: DeployIdentifier}
         bootstrap_server_id: {get_param: [servers, {{primary_role_name}}, '0']}
+        enable_debug: {get_param: ConfigDebug}
         docker_puppet_debug: {get_param: DockerPuppetDebug}
         docker_puppet_process_count: {get_param: DockerPuppetProcessCount}
   {% endfor %}