openstack/cinder
Code Issues Proposed changes

Merge "Remove old oslo.messaging transport aliases"

Browse Source
This commit is contained in:
Jenkins 2017-03-27 16:34:25 +00:00 committed by Gerrit Code Review
commit 1853345ac8
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cinder/rpc.py
View File

@ -23,7 +23,6 @@ __all__ = [
'get_client', 'get_client',
'get_server', 'get_server',
'get_notifier', 'get_notifier',
'TRANSPORT_ALIASES',
] ]
from oslo_config import cfg from oslo_config import cfg
@ -52,29 +51,15 @@ ALLOWED_EXMODS = [
] ]
EXTRA_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): def init(conf):
global TRANSPORT, NOTIFICATION_TRANSPORT, NOTIFIER global TRANSPORT, NOTIFICATION_TRANSPORT, NOTIFIER
exmods = get_allowed_exmods() exmods = get_allowed_exmods()
TRANSPORT = messaging.get_transport(conf, TRANSPORT = messaging.get_transport(conf,
allowed_remote_exmods=exmods, allowed_remote_exmods=exmods)
aliases=TRANSPORT_ALIASES)
NOTIFICATION_TRANSPORT = messaging.get_notification_transport( NOTIFICATION_TRANSPORT = messaging.get_notification_transport(
conf, conf,
allowed_remote_exmods=exmods, allowed_remote_exmods=exmods)
aliases=TRANSPORT_ALIASES)
# get_notification_transport has loaded oslo_messaging_notifications config # get_notification_transport has loaded oslo_messaging_notifications config
# group, so we can now check if notifications are actually enabled. # group, so we can now check if notifications are actually enabled.