From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 24 Jan 2017 20:44:49 +0000 (+0000)
Subject: Merge "Add disable_upgrade_deployment flag to roles_data.yaml"
X-Git-Tag: opnfv-6.0.0~1188
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=76c35757c9071dbafbaff1114ec2a2ccdeb388d6;p=apex-tripleo-heat-templates.git

Merge "Add disable_upgrade_deployment flag to roles_data.yaml"
---

76c35757c9071dbafbaff1114ec2a2ccdeb388d6
diff --cc puppet/major_upgrade_steps.j2.yaml
index 9430a704,9ae02c76..433b03a0
--- a/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: