diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-03 21:42:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-03 21:42:33 +0000 |
| commit | b64f7fa512b4209e781d7159fe7d93bc3d37a99e (patch) | |
| tree | 8ea38ef91c57f9395416555b4cb34b66e96d952e /puppet/major_upgrade_steps.j2.yaml | |
| parent | 3aff42dde21c19247961b78f07e9b5b2cc1e8f00 (diff) | |
| parent | 1b58806a6214f01af74785f5d7791984b7180ce1 (diff) | |
Merge "Reduce number of steps for upgrades"
Diffstat (limited to 'puppet/major_upgrade_steps.j2.yaml')
| -rw-r--r-- | puppet/major_upgrade_steps.j2.yaml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/puppet/major_upgrade_steps.j2.yaml b/puppet/major_upgrade_steps.j2.yaml index 00f863e4..88732f49 100644 --- a/puppet/major_upgrade_steps.j2.yaml +++ b/puppet/major_upgrade_steps.j2.yaml @@ -1,5 +1,6 @@ -{% set upgrade_steps_max = 8 -%} {% set enabled_roles = roles|rejectattr('disable_upgrade_deployment')|list -%} +{% set batch_upgrade_steps_max = 3 -%} +{% set upgrade_steps_max = 6 -%} heat_template_version: ocata description: 'Upgrade steps for all roles' @@ -35,7 +36,7 @@ conditions: resources: # Upgrade Steps for all roles, batched updates -{% for step in range(0, upgrade_steps_max) %} +{% for step in range(0, batch_upgrade_steps_max) %} {% for role in roles %} # Step {{step}} resources {{role.name}}UpgradeBatchConfig_Step{{step}}: @@ -97,7 +98,7 @@ resources: {% endfor %} {% else %} {% for dep in roles %} - - {{dep.name}}UpgradeBatch_Step{{upgrade_steps_max -1}} + - {{dep.name}}UpgradeBatch_Step{{batch_upgrade_steps_max -1}} {% endfor %} {% endif %} properties: @@ -116,7 +117,7 @@ resources: {% endfor %} {% else %} {% for dep in roles %} - - {{dep.name}}UpgradeBatch_Step{{upgrade_steps_max -1}} + - {{dep.name}}UpgradeBatch_Step{{batch_upgrade_steps_max -1}} {% endfor %} {% endif %} properties: |