Revert "messaging-bridge: leverage the rabbit/queue role and add monitoring to the queues"
The messaging bridge queues have very specific setup, we can't use the
rabbit/queue role because it binds all queues to both amq.topic and
zmq.topic and we don't wan't that for the bridges.
This reverts commit 649eec104d
.
This commit is contained in:
parent
ae6c2b6508
commit
5c0ab4d9d0
1 changed files with 15 additions and 40 deletions
|
@ -11,7 +11,6 @@
|
||||||
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
||||||
|
|
||||||
tasks:
|
tasks:
|
||||||
|
|
||||||
- name: Create the RabbitMQ user
|
- name: Create the RabbitMQ user
|
||||||
rabbitmq_user:
|
rabbitmq_user:
|
||||||
user: "messaging-bridge{{ env_suffix }}.fedoraproject.org"
|
user: "messaging-bridge{{ env_suffix }}.fedoraproject.org"
|
||||||
|
@ -23,53 +22,29 @@
|
||||||
- config
|
- config
|
||||||
- rabbitmq_cluster
|
- rabbitmq_cluster
|
||||||
|
|
||||||
- name: setup Queues in RabbitMQ
|
- name: Create the RabbitMQ queue amqp_to_zmq
|
||||||
hosts: rabbitmq[0]:rabbitmq_stg[0]:rabbitmq01.iad2.fedoraproject.org
|
rabbitmq_queue:
|
||||||
user: root
|
name: amqp_to_zmq
|
||||||
gather_facts: False
|
vhost: /pubsub
|
||||||
|
login_user: admin
|
||||||
vars_files:
|
login_password: "{{ (env == 'production')|ternary(rabbitmq_admin_password_production, rabbitmq_admin_password_staging) }}"
|
||||||
- /srv/web/infra/ansible/vars/global.yml
|
|
||||||
- "/srv/private/ansible/vars.yml"
|
|
||||||
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
|
||||||
|
|
||||||
roles:
|
|
||||||
|
|
||||||
- role: rabbit/queue
|
|
||||||
username: "amqp_to_zmq"
|
|
||||||
queue_name: "amqp_to_zmq"
|
|
||||||
routing_keys: "#"
|
|
||||||
thresholds:
|
|
||||||
warning: 10
|
|
||||||
critical: 100
|
|
||||||
tags:
|
tags:
|
||||||
- config
|
- config
|
||||||
- rabbitmq_cluster
|
- rabbitmq_cluster
|
||||||
|
|
||||||
- role: rabbit/queue
|
- name: Create the RabbitMQ queue for verify-missing
|
||||||
username: "amqp_bridge_verify_missing"
|
rabbitmq_queue:
|
||||||
queue_name: "amqp_bridge_verify_missing"
|
name: amqp_bridge_verify_missing
|
||||||
routing_keys: "#"
|
vhost: /pubsub
|
||||||
|
durable: True
|
||||||
|
auto_delete: False
|
||||||
message_ttl: 60000
|
message_ttl: 60000
|
||||||
thresholds:
|
login_user: admin
|
||||||
warning: 10
|
login_password: "{{ (env == 'production')|ternary(rabbitmq_admin_password_production, rabbitmq_admin_password_staging) }}"
|
||||||
critical: 100
|
|
||||||
tags:
|
tags:
|
||||||
- config
|
- config
|
||||||
- rabbitmq_cluster
|
- rabbitmq_cluster
|
||||||
|
|
||||||
- name: setup bindings in RabbitMQ
|
|
||||||
hosts: rabbitmq[0]:rabbitmq_stg[0]:rabbitmq01.iad2.fedoraproject.org
|
|
||||||
user: root
|
|
||||||
gather_facts: False
|
|
||||||
|
|
||||||
vars_files:
|
|
||||||
- /srv/web/infra/ansible/vars/global.yml
|
|
||||||
- "/srv/private/ansible/vars.yml"
|
|
||||||
- /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
|
|
||||||
|
|
||||||
tasks:
|
|
||||||
|
|
||||||
- name: Create the amqp-to-zmq bindings
|
- name: Create the amqp-to-zmq bindings
|
||||||
rabbitmq_binding:
|
rabbitmq_binding:
|
||||||
name: amq.topic
|
name: amq.topic
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue