Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add Octavia API service definitions"
[apex-tripleo-heat-templates.git]
/
puppet
/
major_upgrade_steps.j2.yaml
diff --git
a/puppet/major_upgrade_steps.j2.yaml
b/puppet/major_upgrade_steps.j2.yaml
index
9430a70
..
433b03a
100644
(file)
--- 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 step > 0 %}
depends_on:
{% for dep in roles %}
+ {% if not dep.disable_upgrade_deployment|default(false) %}
- {{dep.name}}Upgrade_Step{{step -1}}
- {{dep.name}}Upgrade_Step{{step -1}}
+ {% endif %}
{% endfor %}
{% endif %}
properties:
UpgradeStepConfig: {get_param: [role_data, {{role.name}}, upgrade_tasks]}
step: {{step}}
{% 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 %}
{{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}}
- {{dep.name}}Upgrade_Step{{step -1}}
+ {% endif %}
{% endfor %}
{% endif %}
properties:
{% endfor %}
{% endif %}
properties:
@@
-53,6
+57,7
@@
resources:
input_values:
role: {{role.name}}
update_identifier: {get_param: UpdateIdentifier}
input_values:
role: {{role.name}}
update_identifier: {get_param: UpdateIdentifier}
+ {% endif %}
{% endfor %}
{% endfor %}
{% endfor %}
{% endfor %}