Remove old oslo.messaging transport aliases
Those are remnants from the oslo-incubator times. Also, oslo.messaging deprecated [1] transport aliases since 5.2.0+ that is the minimal version supported for stable/newton. The patch that bumped the minimal version for Manila landed 3 months+ ago, so we can proceed ripping those aliases from the code base. [1] I314cefa5fb1803fa7e21e3e34300e5ced31bba89 Change-Id: Iea406d784bcef5c4c50e11a49cd967d0143d1d62 Closes-Bug: #1424728
This commit is contained in:
parent
a7c7439ddc
commit
201f99f778
|
@ -23,7 +23,6 @@ __all__ = [
|
||||||
'get_client',
|
'get_client',
|
||||||
'get_server',
|
'get_server',
|
||||||
'get_notifier',
|
'get_notifier',
|
||||||
'TRANSPORT_ALIASES',
|
|
||||||
]
|
]
|
||||||
|
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
|
@ -42,25 +41,12 @@ ALLOWED_EXMODS = [
|
||||||
]
|
]
|
||||||
EXTRA_EXMODS = []
|
EXTRA_EXMODS = []
|
||||||
|
|
||||||
# NOTE(flaper87): The manila.openstack.common.rpc entries are
|
|
||||||
# for backwards compat with Havana rpc_backend configuration
|
|
||||||
# values. The manila.rpc entries are for compat with Folsom values.
|
|
||||||
TRANSPORT_ALIASES = {
|
|
||||||
'manila.openstack.common.rpc.impl_kombu': 'rabbit',
|
|
||||||
'manila.openstack.common.rpc.impl_qpid': 'qpid',
|
|
||||||
'manila.openstack.common.rpc.impl_zmq': 'zmq',
|
|
||||||
'manila.rpc.impl_kombu': 'rabbit',
|
|
||||||
'manila.rpc.impl_qpid': 'qpid',
|
|
||||||
'manila.rpc.impl_zmq': 'zmq',
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def init(conf):
|
def init(conf):
|
||||||
global TRANSPORT, NOTIFIER
|
global TRANSPORT, NOTIFIER
|
||||||
exmods = get_allowed_exmods()
|
exmods = get_allowed_exmods()
|
||||||
TRANSPORT = messaging.get_transport(conf,
|
TRANSPORT = messaging.get_transport(conf,
|
||||||
allowed_remote_exmods=exmods,
|
allowed_remote_exmods=exmods)
|
||||||
aliases=TRANSPORT_ALIASES)
|
|
||||||
|
|
||||||
serializer = RequestContextSerializer(JsonPayloadSerializer())
|
serializer = RequestContextSerializer(JsonPayloadSerializer())
|
||||||
NOTIFIER = messaging.Notifier(TRANSPORT, serializer=serializer)
|
NOTIFIER = messaging.Notifier(TRANSPORT, serializer=serializer)
|
||||||
|
@ -123,7 +109,7 @@ class RequestContextSerializer(messaging.Serializer):
|
||||||
|
|
||||||
|
|
||||||
def get_transport_url(url_str=None):
|
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):
|
def get_client(target, version_cap=None, serializer=None):
|
||||||
|
|
Loading…
Reference in New Issue