openstack/ironic
Code Issues Proposed changes

Remove old oslo.messaging transport aliases

Browse Source 
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. The patch that bumped the minimal
version for Ironic landed 3 months+ ago, so we can proceed ripping
those aliases from the code base.

[1] I314cefa5fb1803fa7e21e3e34300e5ced31bba89

Change-Id: I42dcc4b64f0b8e667abad68f7a5ed1ba004ec329
Closes-Bug: #1424728
This commit is contained in:
ChangBo Guo(gcb) 2017-03-19 21:16:53 +08:00
parent f65067fe81
commit 330ba8c502
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ironic/common/rpc.py
View File

@ -33,24 +33,16 @@ ALLOWED_EXMODS = [
] ]
EXTRA_EXMODS = [] EXTRA_EXMODS = []
TRANSPORT_ALIASES = {
'ironic.rpc.impl_kombu': 'rabbit',
'ironic.rpc.impl_qpid': 'qpid',
'ironic.rpc.impl_zmq': 'zmq',
}
def init(conf): def init(conf):
global TRANSPORT, NOTIFICATION_TRANSPORT global TRANSPORT, NOTIFICATION_TRANSPORT
global SENSORS_NOTIFIER, VERSIONED_NOTIFIER global SENSORS_NOTIFIER, VERSIONED_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)
serializer = RequestContextSerializer(messaging.JsonPayloadSerializer()) serializer = RequestContextSerializer(messaging.JsonPayloadSerializer())
SENSORS_NOTIFIER = messaging.Notifier(NOTIFICATION_TRANSPORT, SENSORS_NOTIFIER = messaging.Notifier(NOTIFICATION_TRANSPORT,
@ -118,7 +110,7 @@ class RequestContextSerializer(messaging.Serializer):
def get_transport_url(url_str=None): def get_transport_url(url_str=None):
return messaging.TransportURL.parse(CONF, url_str, TRANSPORT_ALIASES) return messaging.TransportURL.parse(CONF, url_str)
def get_client(target, version_cap=None, serializer=None): def get_client(target, version_cap=None, serializer=None):