From 1cc699f769d5738efd30c7fd8ca20527e48a03ef Mon Sep 17 00:00:00 2001 From: "ChangBo Guo(gcb)" Date: Sun, 19 Mar 2017 21:00:57 +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 Heat landed 3 months+ ago, so we can proceed ripping those aliases from the code base. [1] I314cefa5fb1803fa7e21e3e34300e5ced31bba89 Change-Id: I55b9b0b1687415861175c670fbf7f893e50f3199 Closes-Bug: #1424728 --- heat/common/messaging.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/heat/common/messaging.py b/heat/common/messaging.py index 526db34306..b76c90bc0f 100644 --- a/heat/common/messaging.py +++ b/heat/common/messaging.py @@ -27,12 +27,6 @@ TRANSPORT = None NOTIFICATIONS_TRANSPORT = None NOTIFIER = None -_ALIASES = { - 'heat.openstack.common.rpc.impl_kombu': 'rabbit', - 'heat.openstack.common.rpc.impl_qpid': 'qpid', - 'heat.openstack.common.rpc.impl_zmq': 'zmq', -} - class RequestContextSerializer(oslo_messaging.Serializer): def __init__(self, base): @@ -79,10 +73,10 @@ def get_specific_transport(url, optional, exmods, is_for_notifications=False): try: if is_for_notifications: return oslo_messaging.get_notification_transport( - cfg.CONF, url, allowed_remote_exmods=exmods, aliases=_ALIASES) + cfg.CONF, url, allowed_remote_exmods=exmods) else: return oslo_messaging.get_transport( - cfg.CONF, url, allowed_remote_exmods=exmods, aliases=_ALIASES) + cfg.CONF, url, allowed_remote_exmods=exmods) except oslo_messaging.InvalidTransportURL as e: if not optional or e.url: # NOTE(sileht): oslo_messaging is configured but unloadable