summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bechtold <tbechtold@suse.com>2017-04-04 18:09:34 +0200
committerThomas Bechtold <tbechtold@suse.com>2017-04-04 18:17:46 +0200
commitd94c40b1e0515117fbe7d04480640641f2a2edbd (patch)
treea7fac26ff80a481b3273a5f1e59efebea6eb0a4f
parenta2e3d60644aadb4ecb3d49dadbcd5d4c1dec2176 (diff)
Remove deprecated oslo.messaging aliases parameter4.15.0
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
Notes
Notes (review): Code-Review+2: Boris Bobrov <breton@cynicmansion.ru> Code-Review+2: Samuel de Medeiros Queiroz <samueldmq@gmail.com> Workflow+1: Samuel de Medeiros Queiroz <samueldmq@gmail.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 05 Apr 2017 12:23:38 +0000 Reviewed-on: https://review.openstack.org/453245 Project: openstack/keystonemiddleware Branch: refs/heads/master
-rw-r--r--keystonemiddleware/audit/_notifier.py20
1 files changed, 1 insertions, 19 deletions
diff --git a/keystonemiddleware/audit/_notifier.py b/keystonemiddleware/audit/_notifier.py
index 83898d4..9d17c29 100644
--- a/keystonemiddleware/audit/_notifier.py
+++ b/keystonemiddleware/audit/_notifier.py
@@ -18,8 +18,6 @@ try:
18except ImportError: 18except ImportError:
19 oslo_messaging = None 19 oslo_messaging = None
20 20
21from pycadf import cadftaxonomy as taxonomy
22
23from keystonemiddleware.i18n import _LI 21from keystonemiddleware.i18n import _LI
24 22
25 23
@@ -46,24 +44,8 @@ class _MessagingNotifier(object):
46 44
47def create_notifier(conf, log): 45def create_notifier(conf, log):
48 if oslo_messaging: 46 if oslo_messaging:
49 proj = conf.project or taxonomy.UNKNOWN
50
51 if proj:
52 # Aliases to support backward compatibility
53 aliases = {
54 '%s.openstack.common.rpc.impl_kombu' % proj: 'rabbit',
55 '%s.openstack.common.rpc.impl_qpid' % proj: 'qpid',
56 '%s.openstack.common.rpc.impl_zmq' % proj: 'zmq',
57 '%s.rpc.impl_kombu' % proj: 'rabbit',
58 '%s.rpc.impl_qpid' % proj: 'qpid',
59 '%s.rpc.impl_zmq' % proj: 'zmq',
60 }
61 else:
62 aliases = {}
63
64 transport = oslo_messaging.get_transport(conf.oslo_conf_obj, 47 transport = oslo_messaging.get_transport(conf.oslo_conf_obj,
65 url=conf.get('transport_url'), 48 url=conf.get('transport_url'))
66 aliases=aliases)
67 49
68 notifier = oslo_messaging.Notifier( 50 notifier = oslo_messaging.Notifier(
69 transport, 51 transport,