From 81030d9a3d7d1dcb434096031128ae77f125312c Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Tue, 16 Feb 2021 13:29:04 -0800
Subject: [PATCH] rabbitmq_cluster: move nagios perms into main playbook in one
 place

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
---
 roles/rabbitmq_cluster/tasks/apps.yml | 26 --------------------------
 roles/rabbitmq_cluster/tasks/main.yml | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/roles/rabbitmq_cluster/tasks/apps.yml b/roles/rabbitmq_cluster/tasks/apps.yml
index 24d3cd8810..623b129aac 100644
--- a/roles/rabbitmq_cluster/tasks/apps.yml
+++ b/roles/rabbitmq_cluster/tasks/apps.yml
@@ -203,19 +203,6 @@
   tags:
   - centos-odcs
 
-- name: Grant the nagios-monitoring user access to the centos-odcs vhost
-  run_once: true
-  delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org"
-  rabbitmq_user:
-    user: nagios-monitoring
-    vhost: /centos-odcs
-    configure_priv: "^$"
-    read_priv: "^$"
-    write_priv: "^$"
-    tags: monitoring
-  tags:
-  - centos-odcs
-
 - name: Create a user for centos-odcs access
   run_once: true
   delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org"
@@ -325,19 +312,6 @@
   tags:
   - mbs-private-queue
 
-- name: Grant the nagios-monitoring user access to the mbs-private-queue vhost
-  run_once: true
-  delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org"
-  rabbitmq_user:
-    user: nagios-monitoring
-    vhost: /mbs-private-queue
-    configure_priv: "^$"
-    read_priv: "^$"
-    write_priv: "^$"
-    tags: monitoring
-  tags:
-  - mbs-private-queue
-
 - name: Create a user for mbs-private-queue access
   run_once: true
   delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org"
diff --git a/roles/rabbitmq_cluster/tasks/main.yml b/roles/rabbitmq_cluster/tasks/main.yml
index b167ef6544..92e18615cc 100644
--- a/roles/rabbitmq_cluster/tasks/main.yml
+++ b/roles/rabbitmq_cluster/tasks/main.yml
@@ -254,6 +254,14 @@
         configure_priv: "^$"
         read_priv: "^$"
         write_priv: "^$"
+      - vhost: /mbs-private-queue
+        configure_priv: "^$"
+        read_priv: "^$"
+        write_priv: "^$"
+      - vhost: /centos-odcs
+        configure_priv: "^$"
+        read_priv: "^$"
+        write_priv: "^$"
     tags: monitoring
   when: env == "staging" and inventory_hostname.startswith('rabbitmq01')
   tags:
@@ -278,6 +286,14 @@
         configure_priv: "^$"
         read_priv: "^$"
         write_priv: "^$"
+      - vhost: /mbs-private-queue
+        configure_priv: "^$"
+        read_priv: "^$"
+        write_priv: "^$"
+      - vhost: /centos-odcs
+        configure_priv: "^$"
+        read_priv: "^$"
+        write_priv: "^$"
     tags: monitoring
   when: env == "production" and inventory_hostname.startswith('rabbitmq01')
   tags: