starlingx
/
distcloud
Code Issues Proposed changes

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 <tao.liu@windriver.com>
This commit is contained in:
Tao Liu 2019-04-10 11:36:33 -04:00
parent 329e3d47da
commit 4139b42efe
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dcmanager/common/messaging.py
View File

@ -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:

8
dcorch/common/messaging.py
View File

@ -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: