From 330ba8c502880a16db4d2673ab36358f559711ec Mon Sep 17 00:00:00 2001 From: "ChangBo Guo(gcb)" Date: Sun, 19 Mar 2017 21:16:53 +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 Ironic landed 3 months+ ago, so we can proceed ripping those aliases from the code base. [1] I314cefa5fb1803fa7e21e3e34300e5ced31bba89 Change-Id: I42dcc4b64f0b8e667abad68f7a5ed1ba004ec329 Closes-Bug: #1424728 --- ironic/common/rpc.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/ironic/common/rpc.py b/ironic/common/rpc.py index a974ca2afc..e6b5de7edf 100644 --- a/ironic/common/rpc.py +++ b/ironic/common/rpc.py @@ -33,24 +33,16 @@ ALLOWED_EXMODS = [ ] EXTRA_EXMODS = [] -TRANSPORT_ALIASES = { - 'ironic.rpc.impl_kombu': 'rabbit', - 'ironic.rpc.impl_qpid': 'qpid', - 'ironic.rpc.impl_zmq': 'zmq', -} - def init(conf): global TRANSPORT, NOTIFICATION_TRANSPORT global SENSORS_NOTIFIER, VERSIONED_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) serializer = RequestContextSerializer(messaging.JsonPayloadSerializer()) SENSORS_NOTIFIER = messaging.Notifier(NOTIFICATION_TRANSPORT, @@ -118,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):