openstack/tripleo-heat-templates
Code Issues Proposed changes

Export container_cli for update & upgrades & post upgrade tasks

Browse Source 
container_cli will be used later by update, upgrade and post upgrade tasks.
This patch is separated from actual tasks, so we can quickly iterate in
multiple patches.

Change-Id: I1ed7dec0019113f1259bce986f354723237f6a25
This commit is contained in:
Emilien Macchi 2018-10-16 12:53:38 -04:00
parent 1ef3efc61f
commit da224f7a9c
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/deploy-steps.j2
View File

@ -644,6 +644,7 @@ outputs:
params: params:
DEPLOY_SOURCE_HOST: {get_param: deployment_source_hosts} DEPLOY_SOURCE_HOST: {get_param: deployment_source_hosts}
DEPLOY_TARGET_HOST: {get_param: deployment_target_hosts} DEPLOY_TARGET_HOST: {get_param: deployment_target_hosts}
CONTAINER_CLI: {get_param: ContainerCli}
template: | template: |
- hosts: DEPLOY_SOURCE_HOST - hosts: DEPLOY_SOURCE_HOST
name: Gather facts from undercloud name: Gather facts from undercloud
@ -661,6 +662,8 @@ outputs:
name: Run update name: Run update
serial: 1 serial: 1
gather_facts: no gather_facts: no
vars:
container_cli: CONTAINER_CLI
tasks: tasks:
- include_tasks: update_steps_tasks.yaml - include_tasks: update_steps_tasks.yaml
with_sequence: start=0 end={{update_steps_max-1}} with_sequence: start=0 end={{update_steps_max-1}}
@ -777,11 +780,14 @@ outputs:
params: params:
DEPLOY_SOURCE_HOST: {get_param: deployment_source_hosts} DEPLOY_SOURCE_HOST: {get_param: deployment_source_hosts}
DEPLOY_TARGET_HOST: {get_param: deployment_target_hosts} DEPLOY_TARGET_HOST: {get_param: deployment_target_hosts}
CONTAINER_CLI: {get_param: ContainerCli}
template: | template: |
- hosts: DEPLOY_TARGET_HOST - hosts: DEPLOY_TARGET_HOST
tasks: tasks:
- include_tasks: upgrade_steps_tasks.yaml - include_tasks: upgrade_steps_tasks.yaml
with_sequence: start=0 end={{upgrade_steps_max-1}} with_sequence: start=0 end={{upgrade_steps_max-1}}
vars:
container_cli: CONTAINER_CLI
loop_control: loop_control:
loop_var: step loop_var: step
post_upgrade_steps_tasks: | post_upgrade_steps_tasks: |
@ -794,11 +800,14 @@ outputs:
params: params:
DEPLOY_SOURCE_HOST: {get_param: deployment_source_hosts} DEPLOY_SOURCE_HOST: {get_param: deployment_source_hosts}
DEPLOY_TARGET_HOST: {get_param: deployment_target_hosts} DEPLOY_TARGET_HOST: {get_param: deployment_target_hosts}
CONTAINER_CLI: {get_param: ContainerCli}
template: | template: |
- hosts: DEPLOY_TARGET_HOST - hosts: DEPLOY_TARGET_HOST
tasks: tasks:
- include_tasks: post_upgrade_steps_tasks.yaml - include_tasks: post_upgrade_steps_tasks.yaml
with_sequence: start=0 end={{post_upgrade_steps_max-1}} with_sequence: start=0 end={{post_upgrade_steps_max-1}}
vars:
container_cli: CONTAINER_CLI
loop_control: loop_control:
loop_var: step loop_var: step
external_upgrade_steps_tasks: {get_attr: [ExternalUpgradeTasks, value]} external_upgrade_steps_tasks: {get_attr: [ExternalUpgradeTasks, value]}