From da224f7a9cace4788c030db19ce01712e99dd3f6 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 16 Oct 2018 12:53:38 -0400 Subject: [PATCH] Export container_cli for update & upgrades & post upgrade tasks 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 --- common/deploy-steps.j2 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2 index 1c35843192..8041b72f01 100644 --- a/common/deploy-steps.j2 +++ b/common/deploy-steps.j2 @@ -644,6 +644,7 @@ outputs: params: DEPLOY_SOURCE_HOST: {get_param: deployment_source_hosts} DEPLOY_TARGET_HOST: {get_param: deployment_target_hosts} + CONTAINER_CLI: {get_param: ContainerCli} template: | - hosts: DEPLOY_SOURCE_HOST name: Gather facts from undercloud @@ -661,6 +662,8 @@ outputs: name: Run update serial: 1 gather_facts: no + vars: + container_cli: CONTAINER_CLI tasks: - include_tasks: update_steps_tasks.yaml with_sequence: start=0 end={{update_steps_max-1}} @@ -777,11 +780,14 @@ outputs: params: DEPLOY_SOURCE_HOST: {get_param: deployment_source_hosts} DEPLOY_TARGET_HOST: {get_param: deployment_target_hosts} + CONTAINER_CLI: {get_param: ContainerCli} template: | - hosts: DEPLOY_TARGET_HOST tasks: - include_tasks: upgrade_steps_tasks.yaml with_sequence: start=0 end={{upgrade_steps_max-1}} + vars: + container_cli: CONTAINER_CLI loop_control: loop_var: step post_upgrade_steps_tasks: | @@ -794,11 +800,14 @@ outputs: params: DEPLOY_SOURCE_HOST: {get_param: deployment_source_hosts} DEPLOY_TARGET_HOST: {get_param: deployment_target_hosts} + CONTAINER_CLI: {get_param: ContainerCli} template: | - hosts: DEPLOY_TARGET_HOST tasks: - include_tasks: post_upgrade_steps_tasks.yaml with_sequence: start=0 end={{post_upgrade_steps_max-1}} + vars: + container_cli: CONTAINER_CLI loop_control: loop_var: step external_upgrade_steps_tasks: {get_attr: [ExternalUpgradeTasks, value]}