From 8a43e9a7453b5c972d05b41c508111600edce010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= Date: Tue, 5 Mar 2019 08:29:28 +0000 Subject: [PATCH] Add passive_declares to the messaging bridges And fix the rabbit user's permissions --- playbooks/openshift-apps/messaging-bridges.yml | 2 +- roles/openshift-apps/messaging-bridges/templates/configmap.yml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/playbooks/openshift-apps/messaging-bridges.yml b/playbooks/openshift-apps/messaging-bridges.yml index 0c052fc5ac..df6d1237c4 100644 --- a/playbooks/openshift-apps/messaging-bridges.yml +++ b/playbooks/openshift-apps/messaging-bridges.yml @@ -17,7 +17,7 @@ vhost: /pubsub read_priv: "((a|z)mq\\.topic|amqp_to_zmq|amqp_bridge_verify_missing)" write_priv: "((a|z)mq\\.topic|amqp_to_zmq|amqp_bridge_verify_missing)" - configure_priv: "((a|z)mq\\.topic|amqp_to_zmq|amqp_bridge_verify_missing)" + configure_priv: "^$" tags: - config - name: Create the RabbitMQ exchanges diff --git a/roles/openshift-apps/messaging-bridges/templates/configmap.yml b/roles/openshift-apps/messaging-bridges/templates/configmap.yml index 1db24f35f7..e3d6c3883d 100644 --- a/roles/openshift-apps/messaging-bridges/templates/configmap.yml +++ b/roles/openshift-apps/messaging-bridges/templates/configmap.yml @@ -9,6 +9,7 @@ data: config.toml: |- amqp_url = "amqps://messaging-bridge{{ env_suffix }}.fedoraproject.org:@rabbitmq01{{ env_suffix }}.phx2.fedoraproject.org/%2Fpubsub" publish_exchange = "amq.topic" + passive_declares = true [tls] ca_cert = "/etc/pki/rabbitmq/ca/rabbitmq-ca.crt" @@ -46,6 +47,7 @@ data: amqp-to-zmq.toml: |- amqp_url = "amqps://messaging-bridge{{ env_suffix }}.fedoraproject.org:@rabbitmq01{{ env_suffix }}.phx2.fedoraproject.org/%2Fpubsub" publish_exchange = "amq.topic" + passive_declares = true [[bindings]] queue = "amqp_to_zmq"