From 692e10eff2fce6d4e64bf7df7a1c8478f0c0aab2 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 18 Mar 2022 17:30:31 +0000
Subject: [PATCH] rabbitmq: follow up for classic queue mirror removal

Follow up to I91d0e23b22319cf3fdb7603f5401d24e3b76a56e, which fixes a
conditional corner case when removing the ha-all policy.

Change-Id: Iea75551bc6d0da7dd10515dd8bd28c014eed7a5e
---
 ansible/roles/rabbitmq/tasks/upgrade.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ansible/roles/rabbitmq/tasks/upgrade.yml b/ansible/roles/rabbitmq/tasks/upgrade.yml
index d7ccb4412b..c4aa2a8d63 100644
--- a/ansible/roles/rabbitmq/tasks/upgrade.yml
+++ b/ansible/roles/rabbitmq/tasks/upgrade.yml
@@ -22,7 +22,7 @@
     service: "{{ rabbitmq_services[service_name] }}"
   become: true
   command: "docker exec {{ service.container_name }} rabbitmqctl list_policies --silent"
-  when: inventory_hostname in groups[role_rabbitmq_groups]
+  delegate_to: "{{ groups[role_rabbitmq_groups] | first }}"
   run_once: true
   register: rabbitmq_policies
   changed_when: false
@@ -34,8 +34,9 @@
     service: "{{ rabbitmq_services[service_name] }}"
   become: true
   command: "docker exec {{ service.container_name }} rabbitmqctl clear_policy ha-all"
+  delegate_to: "{{ groups[role_rabbitmq_groups] | first }}"
   when:
-    - inventory_hostname in groups[role_rabbitmq_groups] and 'ha-all' in rabbitmq_policies.stdout
+    - "'ha-all' in rabbitmq_policies.stdout"
   run_once: true
 
 - import_tasks: config.yml