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
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://opendev.org/openstack/openstack-ansible-rabbitmq_server/commit/461ccfa46cecf671648aac9445407556546736d1.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://opendev.org/openstack/openstack-ansible-rabbitmq_server/commit/461ccfa46cecf671648aac9445407556546736d1.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>