From 460d4771a6be1b7aebc8c86263149e2835cad654 Mon Sep 17 00:00:00 2001 From: Jose Luis Franco Arza Date: Thu, 7 Nov 2019 16:36:12 +0100 Subject: [PATCH] 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 --- deployment/ovn/ovn-dbs-pacemaker-puppet.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml index 7162afb1a9..352ac35e42 100644 --- a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml +++ b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml @@ -356,6 +356,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 @@ -393,7 +394,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