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
This commit is contained in:
parent
0fd23cb0f9
commit
3f14dd561a
|
@ -36,7 +36,6 @@ from paste import deploy
|
||||||
|
|
||||||
from congress.dse2 import dse_node
|
from congress.dse2 import dse_node
|
||||||
from congress import exception
|
from congress import exception
|
||||||
from congress.tests import helper
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
@ -88,13 +87,10 @@ class APIServer(service.ServiceBase):
|
||||||
self.node = None
|
self.node = None
|
||||||
|
|
||||||
if cfg.CONF.distributed_architecture:
|
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
|
# TODO(masa): To support Active-Active HA with DseNode on any
|
||||||
# driver of oslo.messaging, make sure to use same partition_id
|
# driver of oslo.messaging, make sure to use same partition_id
|
||||||
# among multi DseNodes sharing same message topic namespace.
|
# 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)
|
partition_id=self.name)
|
||||||
|
|
||||||
def start(self, key=None, backlog=128):
|
def start(self, key=None, backlog=128):
|
||||||
|
|
|
@ -44,7 +44,6 @@ from congress.dse2 import dse_node
|
||||||
from congress import exception
|
from congress import exception
|
||||||
from congress.managers import datasource as datasource_manager
|
from congress.managers import datasource as datasource_manager
|
||||||
from congress.policy_engines.agnostic import Dse2Runtime
|
from congress.policy_engines.agnostic import Dse2Runtime
|
||||||
from congress.tests import helper
|
|
||||||
from congress import utils
|
from congress import utils
|
||||||
|
|
||||||
|
|
||||||
|
@ -280,10 +279,8 @@ def create2(node=None):
|
||||||
if node:
|
if node:
|
||||||
bus = node
|
bus = node
|
||||||
else:
|
else:
|
||||||
messaging_config = helper.generate_messaging_config()
|
|
||||||
bus_name = "root"
|
bus_name = "root"
|
||||||
bus = dse_node.DseNode(messaging_config, bus_name, [],
|
bus = dse_node.DseNode(cfg.CONF, bus_name, [], partition_id=bus_name)
|
||||||
partition_id=bus_name)
|
|
||||||
|
|
||||||
# create services
|
# create services
|
||||||
services = {}
|
services = {}
|
||||||
|
|
|
@ -64,6 +64,10 @@ function configure_congress {
|
||||||
# 1. multi dse_nodes run on one devstack node
|
# 1. multi dse_nodes run on one devstack node
|
||||||
# 2. each dse_nodes run on different devstack node
|
# 2. each dse_nodes run on different devstack node
|
||||||
iniset $CONGRESS_CONF dse node_id '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
|
fi
|
||||||
|
|
||||||
CONGRESS_DRIVERS="congress.datasources.neutronv2_driver.NeutronV2Driver,"
|
CONGRESS_DRIVERS="congress.datasources.neutronv2_driver.NeutronV2Driver,"
|
||||||
|
|
|
@ -6,4 +6,5 @@ namespace = oslo.log
|
||||||
namespace = oslo.policy
|
namespace = oslo.policy
|
||||||
namespace = oslo.db
|
namespace = oslo.db
|
||||||
namespace = oslo.middleware.cors
|
namespace = oslo.middleware.cors
|
||||||
|
namespace = oslo.messaging
|
||||||
namespace = keystonemiddleware.auth_token
|
namespace = keystonemiddleware.auth_token
|
||||||
|
|
Loading…
Reference in New Issue