openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Honor --skip-deploy-identifier in common deploy tasks for updates 

To continue the work that was done in
I711dbb00a9c34dbd96ef179ef41bff281b0001d1, we also need to skip the common
deploy tasks if --skip-deploy-identifier is passed by the operator.

When using --skip-deploy-identifier, the UpdateIdentifier is set to
None.
Ansible doesn't see None as "", so we really need to test if the
variable is defined or not. That patches changes the logic to test that.
We also support the case where the variable is set to "", and consider
is as empty which means we want to skip the deploy/updates.
It is also doing it for the update playbooks which includes tasks from
commont deploy.

It is not replicating the exact condition as in deploy_steps_playbook.
There is no need to also check if /var/lib/docker-container-startup-configs.json
file is here because it has been created during the initial deployment.

This fix the bug where --skip-deploy-identifier wasn't honored during
stack updates.

Co-Authored-By: Thomas Hervé <therve@redhat.com>
Co-Authored-By: Sam Doran <sdoran@redhat.com>

Change-Id: Ibab17dcaeebea65135fca4f40562109c90f36c27
Related-Bug: #1796924
(cherry picked from commit 5ac6d19f58)
This commit is contained in:
Emilien Macchi 2018-11-15 12:02:46 -05:00
parent 3e641e196a
commit 0bc3e99016
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/deploy-steps.j2
View File

@ -559,7 +559,7 @@ outputs:
register: docker_container_startup_configs_json_stat
- import_tasks: common_deploy_steps_tasks.yaml
when:
- (update_identifier != "" or not docker_container_startup_configs_json_stat.stat.exists)
- ((update_identifier is defined and update_identifier != "" and update_identifier is not none) or not docker_container_startup_configs_json_stat.stat.exists)
tags:
- overcloud
- deploy_steps