aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authormarios <marios@redhat.com>2017-08-04 14:55:48 +0300
committerMarios Andreou <marios@redhat.com>2017-08-15 11:48:48 +0000
commit060ff37c4f64f2baf3dca89f81cd1d4d0a278416 (patch)
tree5d5e4f1db4ce016197f7fa7c789ba9af52abdc96 /common
parent4dabd2c487d998caf43fcee9f906ba27985242f6 (diff)
Also write an upgrade_tasks_playbook
To get this to work upgrade_tasks need to be rewritten with 'when' statements like the update tasks (in parent review from shardy). So that we don't break the existing upgrades workflow, we add these as part of the config download see the depends on Related-Bug: 1708115 Depends-On: Ief593dc758a2ffe33c1cbcbda9289393fcf023e4 Change-Id: Ib01b96a2c26721747d81d98e3d57c4c388663004
Diffstat (limited to 'common')
-rw-r--r--common/deploy-steps.j217
1 files changed, 17 insertions, 0 deletions
diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2
index b36bb97..8d17c22 100644
--- a/common/deploy-steps.j2
+++ b/common/deploy-steps.j2
@@ -11,6 +11,7 @@
# primary role is: {{primary_role_name}}
{% set deploy_steps_max = 6 -%}
{% set update_steps_max = 6 -%}
+{% set upgrade_steps_max = 6 -%}
heat_template_version: pike
@@ -337,4 +338,20 @@ outputs:
with_sequence: count={{deploy_steps_max-1}}
loop_control:
loop_var: step
+ upgrade_steps_tasks: |
+{%- for role in roles %}
+ - include: {{role.name}}/upgrade_tasks.yaml
+ when: role_name == '{{role.name}}'
+{%- endfor %}
+ upgrade_steps_playbook: |
+ - hosts: overcloud
+ tasks:
+ - include: upgrade_steps_tasks.yaml
+ with_sequence: count={{upgrade_steps_max-1}}
+ loop_control:
+ loop_var: step
+ - include: deploy_steps_tasks.yaml
+ with_sequence: count={{deploy_steps_max-1}}
+ loop_control:
+ loop_var: step