openstack
/
neutron
Code Issues Proposed changes

Merge "neutron-rpc-server fails with no plugins loaded" into stable/newton

This commit is contained in:
Jenkins 2017-06-26 22:05:12 +00:00 committed by Gerrit Code Review
parent 97415aa844 3f76a2fb11
commit 9c25a20084
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron/server/rpc_eventlet.py
View File

@ -21,6 +21,7 @@
from oslo_log import log
from neutron._i18n import _LI
from neutron import manager
from neutron import service
LOG = log.getLogger(__name__)
@ -30,7 +31,9 @@ def eventlet_rpc_server():
LOG.info(_LI("Eventlet based AMQP RPC server starting..."))
try:
rpc_workers_launcher = service.start_rpc_workers()
manager.init()
workers = service._get_rpc_workers() + service._get_plugins_workers()
rpc_workers_launcher = service._start_workers(workers)
except NotImplementedError:
LOG.info(_LI("RPC was already started in parent process by "
"plugin."))