diff --git a/cloudpulse/common/rpc.py b/cloudpulse/common/rpc.py index e6bcfd2..379ed3d 100644 --- a/cloudpulse/common/rpc.py +++ b/cloudpulse/common/rpc.py @@ -24,7 +24,6 @@ __all__ = [ 'get_client', 'get_server', 'get_notifier', - 'TRANSPORT_ALIASES', ] from oslo_config import cfg @@ -47,14 +46,6 @@ EXTRA_EXMODS = [] # NOTE(lucasagomes): The cloudpulse.openstack.common.rpc entries are for # backwards compat with IceHouse rpc_backend configuration values. -TRANSPORT_ALIASES = { - 'cloudpulse.openstack.common.rpc.impl_kombu': 'rabbit', - 'cloudpulse.openstack.common.rpc.impl_qpid': 'qpid', - 'cloudpulse.openstack.common.rpc.impl_zmq': 'zmq', - 'cloudpulse.rpc.impl_kombu': 'rabbit', - 'cloudpulse.rpc.impl_qpid': 'qpid', - 'cloudpulse.rpc.impl_zmq': 'zmq', -} def init(conf): @@ -119,7 +110,7 @@ class RequestContextSerializer(messaging.Serializer): def get_transport_url(url_str=None): - return messaging.TransportURL.parse(CONF, url_str, TRANSPORT_ALIASES) + return messaging.TransportURL.parse(CONF, url_str) def get_client(target, version_cap=None, serializer=None): diff --git a/cloudpulse/common/rpc_service.py b/cloudpulse/common/rpc_service.py index b4edf81..859bcc7 100644 --- a/cloudpulse/common/rpc_service.py +++ b/cloudpulse/common/rpc_service.py @@ -33,11 +33,6 @@ eventlet.monkey_patch() # NOTE(asalkeld): # The cloudpulse.openstack.common.rpc entries are for compatibility # with devstack rpc_backend configuration values. -TRANSPORT_ALIASES = { - 'cloudpulse.openstack.common.rpc.impl_kombu': 'rabbit', - 'cloudpulse.openstack.common.rpc.impl_qpid': 'qpid', - 'cloudpulse.openstack.common.rpc.impl_zmq': 'zmq', -} class RequestContextSerializer(messaging.Serializer): @@ -68,8 +63,7 @@ class Service(object): def __init__(self, topic, server, handlers): serializer = RequestContextSerializer( objects_base.CloudpulseObjectSerializer()) - transport = messaging.get_rpc_transport(cfg.CONF, - aliases=TRANSPORT_ALIASES) + transport = messaging.get_rpc_transport(cfg.CONF) # TODO(asalkeld) add support for version='x.y' target = messaging.Target(topic=topic, server=server) access_policy = dispatcher.DefaultRPCAccessPolicy