From 07d0ee605e5c3784177635b627c8edfaf1cf020a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Wed, 10 Oct 2018 14:39:38 +0000
Subject: [PATCH] Fix config file and queue parameters

---
 .../openshift-apps/messaging-bridges.yml      |  4 +++-
 .../messaging-bridges/templates/configmap.yml | 22 ++++++++++++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/playbooks/openshift-apps/messaging-bridges.yml b/playbooks/openshift-apps/messaging-bridges.yml
index ab11aa6a6e..26626e525c 100644
--- a/playbooks/openshift-apps/messaging-bridges.yml
+++ b/playbooks/openshift-apps/messaging-bridges.yml
@@ -44,7 +44,9 @@
     rabbitmq_queue:
       name: amqp_bridge_verify_missing
       vhost: /pubsub
-      auto_delete: True
+      durable: True
+      auto_delete: False
+      message_ttl: 60000
       login_user: admin
       login_password: "{{ rabbitmq_admin_password_staging }}"
     tags:
diff --git a/roles/openshift-apps/messaging-bridges/templates/configmap.yml b/roles/openshift-apps/messaging-bridges/templates/configmap.yml
index 1381796384..23d61399ed 100644
--- a/roles/openshift-apps/messaging-bridges/templates/configmap.yml
+++ b/roles/openshift-apps/messaging-bridges/templates/configmap.yml
@@ -151,6 +151,22 @@ data:
     ]
     
     [verify_missing]
+    # The queue to setup
+    [verify_missing.queue]
+    queue = "amqp_bridge_verify_missing"
+    durable = true
+    auto_delete = false
+    exclusive = false
+    arguments = {"x-message-ttl": 60000}
+    # The exchanges to declare
+    [[verify_missing.exchanges]]
+    exchange = "amq.topic"
+    exchange_type = "topic"
+    durable = true
+    [[verify_missing.exchanges]]
+    exchange = "zmq.topic"
+    exchange_type = "topic"
+    durable = true
     # The bindings to use for the AMQP queue
     [[verify_missing.bindings]]
     exchange = "zmq.topic"
@@ -160,12 +176,6 @@ data:
     exchange = "amq.topic"
     queue = "amqp_bridge_verify_missing"
     routing_keys = ["#"]
-
-    [queues.verify_missing]
-    durable = true
-    auto_delete = false
-    exclusive = false
-    arguments = {}
     
     [log_config]
     version = 1