Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

rabbitmq_cluster: move nagios perms into main playbook in one place

Browse source 
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2021-02-16 13:29:04 -08:00
parent deee7e9b9f
commit 81030d9a3d
2 changed files with 16 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

26
roles/rabbitmq_cluster/tasks/apps.yml
View file

@ -203,19 +203,6 @@
tags: tags:
- centos-odcs - 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 - name: Create a user for centos-odcs access
run_once: true run_once: true
delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org" delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org"
@ -325,19 +312,6 @@
tags: tags:
- mbs-private-queue - 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 - name: Create a user for mbs-private-queue access
run_once: true run_once: true
delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org" delegate_to: "rabbitmq01{{ env_suffix }}.iad2.fedoraproject.org"

16
roles/rabbitmq_cluster/tasks/main.yml
View file

@ -254,6 +254,14 @@
configure_priv: "^$" configure_priv: "^$"
read_priv: "^$" read_priv: "^$"
write_priv: "^$" write_priv: "^$"
- vhost: /mbs-private-queue
configure_priv: "^$"
read_priv: "^$"
write_priv: "^$"
- vhost: /centos-odcs
configure_priv: "^$"
read_priv: "^$"
write_priv: "^$"
tags: monitoring tags: monitoring
when: env == "staging" and inventory_hostname.startswith('rabbitmq01') when: env == "staging" and inventory_hostname.startswith('rabbitmq01')
tags: tags:
@ -278,6 +286,14 @@
configure_priv: "^$" configure_priv: "^$"
read_priv: "^$" read_priv: "^$"
write_priv: "^$" write_priv: "^$"
- vhost: /mbs-private-queue
configure_priv: "^$"
read_priv: "^$"
write_priv: "^$"
- vhost: /centos-odcs
configure_priv: "^$"
read_priv: "^$"
write_priv: "^$"
tags: monitoring tags: monitoring
when: env == "production" and inventory_hostname.startswith('rabbitmq01') when: env == "production" and inventory_hostname.startswith('rabbitmq01')
tags: tags: