From 3f14dd561a8da024eab7ca57c8f4f4ccc36b1ca7 Mon Sep 17 00:00:00 2001
From: Anusha Ramineni <anusha.ramineni@nectechnologies.in>
Date: Tue, 24 May 2016 14:23:31 +0530
Subject: [PATCH] Make the messaging driver configurable

Instead of defaulting to kombu+memory messaging driver, make the
option configurable for the end user.

Changing the config option rpc_backend will change to the
corresponding messaging driver.
Eg: rpc_backend=kombu+memory or rpc_backend=rabbit etc

Change-Id: If1bd27b6cf7d0f732e01bf3a9614f94e49b523cb
---
 congress/common/eventlet_server.py | 6 +-----
 congress/harness.py                | 5 +----
 devstack/plugin.sh                 | 4 ++++
 etc/congress-config-generator.conf | 1 +
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/congress/common/eventlet_server.py b/congress/common/eventlet_server.py
index a18a1b416..b7444068a 100644
--- a/congress/common/eventlet_server.py
+++ b/congress/common/eventlet_server.py
@@ -36,7 +36,6 @@ from paste import deploy
 
 from congress.dse2 import dse_node
 from congress import exception
-from congress.tests import helper
 
 LOG = logging.getLogger(__name__)
 
@@ -88,13 +87,10 @@ class APIServer(service.ServiceBase):
         self.node = None
 
         if cfg.CONF.distributed_architecture:
-            messaging_config = helper.generate_messaging_config()
-            messaging_config.rpc_response_timeout = 10
-
             # TODO(masa): To support Active-Active HA with DseNode on any
             # driver of oslo.messaging, make sure to use same partition_id
             # among multi DseNodes sharing same message topic namespace.
-            self.node = dse_node.DseNode(messaging_config, self.name, [],
+            self.node = dse_node.DseNode(cfg.CONF, self.name, [],
                                          partition_id=self.name)
 
     def start(self, key=None, backlog=128):
diff --git a/congress/harness.py b/congress/harness.py
index 0687c4bfe..349ef29a7 100644
--- a/congress/harness.py
+++ b/congress/harness.py
@@ -44,7 +44,6 @@ from congress.dse2 import dse_node
 from congress import exception
 from congress.managers import datasource as datasource_manager
 from congress.policy_engines.agnostic import Dse2Runtime
-from congress.tests import helper
 from congress import utils
 
 
@@ -280,10 +279,8 @@ def create2(node=None):
     if node:
         bus = node
     else:
-        messaging_config = helper.generate_messaging_config()
         bus_name = "root"
-        bus = dse_node.DseNode(messaging_config, bus_name, [],
-                               partition_id=bus_name)
+        bus = dse_node.DseNode(cfg.CONF, bus_name, [], partition_id=bus_name)
 
     # create services
     services = {}
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 5146572de..87c3cda3f 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -64,6 +64,10 @@ function configure_congress {
         # 1. multi dse_nodes run on one devstack node
         # 2. each dse_nodes run on different devstack node
         iniset $CONGRESS_CONF dse node_id 'devstack-node'
+
+        # Set RabbitMQ credentials
+        iniset $CONGRESS_CONF oslo_messaging_rabbit rabbit_userid $RABBIT_USERID
+        iniset $CONGRESS_CONF oslo_messaging_rabbit rabbit_password $RABBIT_PASSWORD
     fi
 
     CONGRESS_DRIVERS="congress.datasources.neutronv2_driver.NeutronV2Driver,"
diff --git a/etc/congress-config-generator.conf b/etc/congress-config-generator.conf
index c7a577c80..a16ec9a74 100644
--- a/etc/congress-config-generator.conf
+++ b/etc/congress-config-generator.conf
@@ -6,4 +6,5 @@ namespace = oslo.log
 namespace = oslo.policy
 namespace = oslo.db
 namespace = oslo.middleware.cors
+namespace = oslo.messaging
 namespace = keystonemiddleware.auth_token