From eaaa8bdc531d63501a5705a549b00d9965ea6701 Mon Sep 17 00:00:00 2001
From: noelmcloughlin <noel.mcloughlin@gmail.com>
Date: Sat, 24 Jul 2021 00:58:55 +0100
Subject: [PATCH] fix(guest): remove guest user from all nodes

---
 rabbitmq/config/users/install.sls | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/rabbitmq/config/users/install.sls b/rabbitmq/config/users/install.sls
index a4f239fc..92aa9ac8 100644
--- a/rabbitmq/config/users/install.sls
+++ b/rabbitmq/config/users/install.sls
@@ -38,12 +38,11 @@ rabbitmq-config-users-added-{{ name }}-{{ user }}:
 
             {%- endfor %}
         {%- endif %}
-    {%- endfor %}
-
-    {% if salt['pillar.get']('rabbitmq:remove_guest_user', True) %}
+        {% if node.remove_guest_user == True %}
 
-rabbitmq-config-users-guest-absent:
+rabbitmq-config-users-guest-absent-{{ name }}:
   rabbitmq_user.absent:
     - name: guest
 
-    {% endif %}
+        {% endif %}
+    {%- endfor %}