Merge "neutron-rpc-server fails with no plugins loaded" into stable/newton
This commit is contained in:
commit
9c25a20084
@ -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."))
|
||||
|
Loading…
Reference in New Issue
Block a user