From 1396510eb8309a2f89bafd999a372799c3dd0e62 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Tue, 12 Nov 2024 19:22:27 +0100 Subject: [PATCH] Get exact version of installed rabbitmq This makes us possible to leverage version comparison instead of search. This also might come handy in the future when we need to be more specific of expected versions for upgrade process. Change-Id: I7a132145bc781db999f82ecb192e6e1ecfc9c0ad --- tasks/rabbitmq_upgrade_check.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tasks/rabbitmq_upgrade_check.yml b/tasks/rabbitmq_upgrade_check.yml index 0cb0660a..e7549ab7 100644 --- a/tasks/rabbitmq_upgrade_check.yml +++ b/tasks/rabbitmq_upgrade_check.yml @@ -17,7 +17,7 @@ # so we skip this task in the ansible-lint check by using the # 'skip_ansible_lint' tag - name: Get version of installed RabbitMQ package (deb) - command: "dpkg-query -W rabbitmq-server" + command: "dpkg-query -f='${Version}' -W rabbitmq-server" changed_when: false check_mode: false failed_when: false @@ -34,7 +34,7 @@ # so we skip this task in the ansible-lint check by using the # 'skip_ansible_lint' tag - name: Get version of installed RabbitMQ package (rpm) - command: "rpm -q rabbitmq-server" + command: "rpm --queryformat '%{VERSION}' -q rabbitmq-server" changed_when: false check_mode: false failed_when: false @@ -62,7 +62,7 @@ when: - not rabbitmq_upgrade | bool - installed_rabbitmq.rc == 0 - - not installed_rabbitmq.stdout is search(rabbitmq_package_version) + - not (installed_rabbitmq.stdout | split('-') | first) is version(rabbitmq_package_version | split('-') | first) - rabbitmq_install_method != 'distro' tags: - rabbitmq-package-deb