Merge "Add disable_upgrade_deployment flag to roles_data.yaml"

1 files changed, 6 insertions, 1 deletions

diff --git a/puppet/major_upgrade_steps.j2.yaml b/puppet/major_upgrade_steps.j2.yaml
index 9430a704..433b03a0 100644
--- a/puppet/major_upgrade_steps.j2.yaml
+++ b/puppet/major_upgrade_steps.j2.yaml
@@ -31,19 +31,23 @@ resources:
   {% if step > 0 %}
     depends_on:
       {% for dep in roles %}
+        {% if not dep.disable_upgrade_deployment|default(false) %}
       - {{dep.name}}Upgrade_Step{{step -1}}
+        {% endif %}
       {% endfor %}
   {% endif %}
     properties:
       UpgradeStepConfig: {get_param: [role_data, {{role.name}}, upgrade_tasks]}
       step: {{step}}
-
+  {% if not role.disable_upgrade_deployment|default(false) %}
   {{role.name}}Upgrade_Step{{step}}:
     type: OS::Heat::StructuredDeploymentGroup
   {% if step > 0 %}
     depends_on:
       {% for dep in roles %}
+        {% if not dep.disable_upgrade_deployment|default(false) %}
       - {{dep.name}}Upgrade_Step{{step -1}}
+        {% endif %}
       {% endfor %}
   {% endif %}
     properties:
@@ -53,6 +57,7 @@ resources:
       input_values:
         role: {{role.name}}
         update_identifier: {get_param: UpdateIdentifier}
+  {% endif %}
   {% endfor %}
 {% endfor %}