From 4139b42efe620b658aa48fd73edc2561a099ca3a Mon Sep 17 00:00:00 2001 From: Tao Liu Date: Wed, 10 Apr 2019 11:36:33 -0400 Subject: [PATCH] Remove oslo transport aliases Aliases were first deprecated in oslo.messaging 5.20.0 during Pike, and they have been removed in Stein. This update removes oslo transport aliases in both dcorch and dcmanager messaging to support the containerized keystone-api-proxy that uses Stein. Story: 2004766 Task: 30450 Change-Id: I015e23575d56ab031a7a94efa4ec5464fcd3f543 Signed-off-by: Tao Liu --- dcmanager/common/messaging.py | 8 +------- dcorch/common/messaging.py | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/dcmanager/common/messaging.py b/dcmanager/common/messaging.py index badc963d0..9c8586fa0 100644 --- a/dcmanager/common/messaging.py +++ b/dcmanager/common/messaging.py @@ -28,12 +28,6 @@ from dcmanager.common import context TRANSPORT = None NOTIFIER = None -_ALIASES = { - 'dcmanager.openstack.common.rpc.impl_kombu': 'rabbit', - 'dcmanager.openstack.common.rpc.impl_qpid': 'qpid', - 'dcmanager.openstack.common.rpc.impl_zmq': 'zmq', -} - class RequestContextSerializer(oslo_messaging.Serializer): def __init__(self, base): @@ -78,7 +72,7 @@ def setup(url=None, optional=False): exmods = ['dcmanager.common.exception'] try: TRANSPORT = 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: TRANSPORT = None if not optional or e.url: diff --git a/dcorch/common/messaging.py b/dcorch/common/messaging.py index 87cde57fc..35c6dbe2f 100644 --- a/dcorch/common/messaging.py +++ b/dcorch/common/messaging.py @@ -21,12 +21,6 @@ from dcorch.common import context TRANSPORT = None NOTIFIER = None -_ALIASES = { - 'dcorch-engine.openstack.common.rpc.impl_kombu': 'rabbit', - 'dcorch-engine.openstack.common.rpc.impl_qpid': 'qpid', - 'dcorch-engine.openstack.common.rpc.impl_zmq': 'zmq', -} - class RequestContextSerializer(oslo_messaging.Serializer): def __init__(self, base): @@ -71,7 +65,7 @@ def setup(url=None, optional=False): exmods = ['dcorch-engine.common.exception'] try: TRANSPORT = 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: TRANSPORT = None if not optional or e.url: