openstack
/
keystonemiddleware
Code Issues Proposed changes

Remove deprecated oslo.messaging aliases parameter 

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.

[1] I314cefa5fb1803fa7e21e3e34300e5ced31bba89

Closes-Bug: #1424728
Change-Id: I50c4559ea2ebc8512a05ffad52e5f04b22743ff4
This commit is contained in:
Thomas Bechtold 2017-04-04 18:09:34 +02:00
parent a2e3d60644
commit d94c40b1e0
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
keystonemiddleware/audit/_notifier.py
View File

@ -18,8 +18,6 @@ try:
except ImportError: except ImportError:
oslo_messaging = None oslo_messaging = None
from pycadf import cadftaxonomy as taxonomy
from keystonemiddleware.i18n import _LI from keystonemiddleware.i18n import _LI
@ -46,24 +44,8 @@ class _MessagingNotifier(object):
def create_notifier(conf, log): def create_notifier(conf, log):
if oslo_messaging: if oslo_messaging:
proj = conf.project or taxonomy.UNKNOWN
if proj:
# Aliases to support backward compatibility
aliases = {
'%s.openstack.common.rpc.impl_kombu' % proj: 'rabbit',
'%s.openstack.common.rpc.impl_qpid' % proj: 'qpid',
'%s.openstack.common.rpc.impl_zmq' % proj: 'zmq',
'%s.rpc.impl_kombu' % proj: 'rabbit',
'%s.rpc.impl_qpid' % proj: 'qpid',
'%s.rpc.impl_zmq' % proj: 'zmq',
}
else:
aliases = {}
transport = oslo_messaging.get_transport(conf.oslo_conf_obj, transport = oslo_messaging.get_transport(conf.oslo_conf_obj,
url=conf.get('transport_url'), url=conf.get('transport_url'))
aliases=aliases)
notifier = oslo_messaging.Notifier( notifier = oslo_messaging.Notifier(
transport, transport,