From f8c875cda0a9a48e9a1cec92224a1453d50233aa Mon Sep 17 00:00:00 2001 From: "ChangBo Guo(gcb)" Date: Sun, 19 Mar 2017 20:51:44 +0800 Subject: [PATCH] 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 Cinder landed 3 months+ ago, so we can proceed ripping those aliases from the code base. [1] I314cefa5fb1803fa7e21e3e34300e5ced31bba89 Closes-Bug: #1424728 Change-Id: Ibaab1c9132bea25abdf6dfbad2550ba572d5cf1d --- cinder/rpc.py | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/cinder/rpc.py b/cinder/rpc.py index d58ca1d344e..29bbfca2bac 100644 --- a/cinder/rpc.py +++ b/cinder/rpc.py @@ -23,7 +23,6 @@ __all__ = [ 'get_client', 'get_server', 'get_notifier', - 'TRANSPORT_ALIASES', ] from oslo_config import cfg @@ -51,29 +50,15 @@ ALLOWED_EXMODS = [ ] EXTRA_EXMODS = [] -# NOTE(flaper87): The cinder.openstack.common.rpc entries are -# for backwards compat with Havana rpc_backend configuration -# values. The cinder.rpc entries are for compat with Folsom values. -TRANSPORT_ALIASES = { - 'cinder.openstack.common.rpc.impl_kombu': 'rabbit', - 'cinder.openstack.common.rpc.impl_qpid': 'qpid', - 'cinder.openstack.common.rpc.impl_zmq': 'zmq', - 'cinder.rpc.impl_kombu': 'rabbit', - 'cinder.rpc.impl_qpid': 'qpid', - 'cinder.rpc.impl_zmq': 'zmq', -} - def init(conf): global TRANSPORT, NOTIFICATION_TRANSPORT, NOTIFIER exmods = get_allowed_exmods() TRANSPORT = messaging.get_transport(conf, - allowed_remote_exmods=exmods, - aliases=TRANSPORT_ALIASES) + allowed_remote_exmods=exmods) NOTIFICATION_TRANSPORT = messaging.get_notification_transport( conf, - allowed_remote_exmods=exmods, - aliases=TRANSPORT_ALIASES) + allowed_remote_exmods=exmods) # get_notification_transport has loaded oslo_messaging_notifications config # group, so we can now check if notifications are actually enabled.