openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Define ovn_dbs_image fact for upgrades. 

The ovn upgrade_tasks make use of a block which belongs
to the update_tasks. In that block, the ovs_dbs_image
variable is being referenced. However, the fact is set
in a step before the block invoked.

This patch sets ovn_dbs_image fact in step0 for upgrade
tasks and fixes a small typo with the bundle.

Change-Id: I1d24dce0ff9c88380e8769593d619a9e4e944e40
Closes-Bug: #1851669
(cherry picked from commit 460d4771a6)
This commit is contained in:
Jose Luis Franco Arza 2019-11-07 16:36:12 +01:00 committed by Emilien Macchi
parent 18ce57ea87
commit 06b12b33cb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
View File

@ -351,6 +351,7 @@ outputs:
failed_when: false
- name: ovn-dbs image facts
set_fact:
ovn_dbs_image: {get_param: ContainerOvnDbsImage}
ovn_dbs_image_latest: *ovn_dbs_image_pcmklatest
ovn_dbs_image_current: "{{ovn_dbs_image_current_res.stdout}}"
- name: Temporarily tag the current ovn_dbs image id with the upgraded image name
@ -388,7 +389,7 @@ outputs:
block:
- name: Disable the ovn-dbs-bundle cluster resource before container upgrade
pacemaker_resource:
resource: ovn-dbs-bindle
resource: ovn-dbs-bundle
state: disable
wait_for_resource: true
register: output