aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-18 16:01:03 +0000
committerGerrit Code Review <review@openstack.org>2017-08-18 16:01:03 +0000
commita906f71d8e1254efd46ca0fe499c2750b9bcfaea (patch)
treeb269beb016b84a9e7dffb3e9706211d8af438399
parent8865ab2985d0baf039c5f03ac0fab07ff8f2bab4 (diff)
parent060ff37c4f64f2baf3dca89f81cd1d4d0a278416 (diff)
Merge "Also write an upgrade_tasks_playbook"
-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 b36bb97a..8d17c223 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