Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove old oslo.messaging transport aliases"

Browse Source
This commit is contained in:
Jenkins
2017-03-21 09:24:23 +00:00
committed by Gerrit Code Review
parent f7b655b712 1386ce690f
commit b5eccceaed
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
watcher/common/rpc.py
View File

@@ -32,7 +32,6 @@ __all__ = [
'get_client', 'get_client',
'get_server', 'get_server',
'get_notifier', 'get_notifier',
'TRANSPORT_ALIASES',
] ]
CONF = cfg.CONF CONF = cfg.CONF
@@ -46,16 +45,6 @@ ALLOWED_EXMODS = [
] ]
EXTRA_EXMODS = [] EXTRA_EXMODS = []
# NOTE(lucasagomes): The watcher.openstack.common.rpc entries are for
# backwards compat with IceHouse rpc_backend configuration values.
TRANSPORT_ALIASES = {
'watcher.openstack.common.rpc.impl_kombu': 'rabbit',
'watcher.openstack.common.rpc.impl_qpid': 'qpid',
'watcher.openstack.common.rpc.impl_zmq': 'zmq',
'watcher.rpc.impl_kombu': 'rabbit',
'watcher.rpc.impl_qpid': 'qpid',
'watcher.rpc.impl_zmq': 'zmq',
}
JsonPayloadSerializer = messaging.JsonPayloadSerializer JsonPayloadSerializer = messaging.JsonPayloadSerializer
@@ -64,12 +53,10 @@ 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)
serializer = RequestContextSerializer(JsonPayloadSerializer()) serializer = RequestContextSerializer(JsonPayloadSerializer())
if not conf.notification_level: if not conf.notification_level: