Merge "Add disable_upgrade_deployment flag to roles_data.yaml"

diff --cc puppet/major_upgrade_steps.j2.yaml
index 9430a70,9ae02c7..433b03a
--- 1/puppet/major_upgrade_steps.j2.yaml
--- 2/puppet/major_upgrade_steps.j2.yaml
+++ b/puppet/major_upgrade_steps.j2.yaml
@@@ -28,22 -28,26 +28,26 @@@ resources
    # serialization, but the event output is easier to follow if we
    # do, and there should be minimal performance hit (creating the
    # config is cheap compared to the time to apply the deployment).
 -  {% if step > 1 %}
 +  {% 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 > 1 %}
 +  {% 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:

diff --cc roles_data.yaml
Simple merge