From 60854d12f4f4ce178b22f0e6c5533c4915c9d0a4 Mon Sep 17 00:00:00 2001 From: "Jesse Pretorius (odyssey4me)" Date: Tue, 29 Oct 2019 10:38:17 +0000 Subject: [PATCH] Correct ovn-dbs upgrade image id variable In I8b5b25d03b86b2c44b2d47e5a0624e7dd13873da the variable ovn_dbs_image_id was renamed to old_ovn_dbs_image_id but one instance of it was left behind. This patch corrects that. Related-Bug: #1838971 Closes: rhbz#1758578 Change-Id: I5735210aad47411fdeb62d4dab45b1150ec3ea04 (cherry picked from commit 41a17bfc1a4326f19a94e1ed7092790fae51ae8d) --- deployment/ovn/ovn-dbs-pacemaker-puppet.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml index e2f25e74b5..87f4179b76 100644 --- a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml +++ b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml @@ -310,7 +310,7 @@ outputs: - name: Remove previous ovn-dbs images shell: "{{container_cli}} rmi -f {{old_ovn_dbs_image_id.stdout}}" when: - - ovn_dbs_image_id.stdout != '' + - old_ovn_dbs_image_id.stdout != '' - old_ovn_dbs_image_id.stdout != new_ovn_dbs_image_id.stdout # We remove any leftover error and remove the ban. - name: Ensure the cluster converge back even in case of schema change