From 7390461041e8d101baed11d1a4b593897e4ac1fa Mon Sep 17 00:00:00 2001
From: Andrew Smith <ansmith@redhat.com>
Date: Tue, 21 Jun 2016 12:20:11 -0400
Subject: [PATCH] Update qdrouterd.conf for qpid-dispatch-router

V0.6 schema changes for configuration entities.

Change-Id: Ibc0b79d333edeba6d8d3ede1e8bbd23d4d02ffde
---
 devstack/plugin.sh | 65 ++++++++++++++++++++++++++++++----------------
 1 file changed, 43 insertions(+), 22 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index aa5545c..e2be091 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -169,24 +169,17 @@ function _configure_qdr {
 
     # qdouterd.conf file customization for devstack deployment
     # Define attributes related to the AMQP container
+    # Create stand alone router
     cat <<EOF | sudo tee $qdr_conf_file
-container {
+router {
+    mode: standalone
+    id: Router.A
     workerThreads: 4
-    containerName: Qpid.Dispatch.Router.A
     saslConfigPath: /etc/sasl2
     saslConfigName: qdrouterd
     debugDump: /opt/stack/amqp1
 }
 
-EOF
-
-    # Create stand alone router
-    cat <<EOF | sudo tee --append $qdr_conf_file
-router {
-    mode: standalone
-    routerId: Router.A
-}
-
 EOF
 
     # Create a listener for incoming connect to the router
@@ -227,21 +220,49 @@ EOF
 
     # Create fixed address prefixes
     cat <<EOF | sudo tee --append $qdr_conf_file
-fixedAddress {
-    prefix: /unicast
-    fanout: single
-    bias: closest
+address {
+    prefix: unicast
+    distribution: closest
 }
 
-fixedAddress {
-    prefix: /exclusive
-    fanout: single
-    bias: closest
+address {
+    prefix: exclusive
+    distribution: closest
 }
 
-fixedAddress {
-    prefix: /broadcast
-    fanout: multiple
+address {
+    prefix: broadcast
+    distribution: multicast
+}
+
+address {
+    prefix: openstack.org/om/rpc/multicast
+    distribution: multicast
+}
+
+address {
+    prefix: openstack.org/om/rpc/unicast
+    distribution: closest
+}
+
+address {
+    prefix: openstack.org/om/rpc/anycast
+    distribution: balanced
+}
+
+address {
+    prefix: openstack.org/om/notify/multicast
+    distribution: multicast
+}
+
+address {
+    prefix: openstack.org/om/notify/unicast
+    distribution: closest
+}
+
+address {
+    prefix: openstack.org/om/notify/anycast
+    distribution: balanced
 }
 
 EOF