From 9f4e3a71077389a214c10aaea7608e69a399b317 Mon Sep 17 00:00:00 2001 From: Eugene Nikanorov Date: Thu, 28 Nov 2013 12:46:41 +0400 Subject: [PATCH] Avoid loading policy when processing rpc requests When Neutron server is restarted in the environment where multiple agents are sending rpc requests to Neutron, it causes loading of policy.json before API extensions are loaded. That causes different policy check failures later on. This patch avoids loading policy when creating a Context in rpc layer. Change-Id: I66212baa937ec1457e0d284b5445de5243a8931f Partial-Bug: 1254555 --- neutron/common/rpc.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neutron/common/rpc.py b/neutron/common/rpc.py index c2b5aae7f9..643cf59344 100644 --- a/neutron/common/rpc.py +++ b/neutron/common/rpc.py @@ -39,6 +39,7 @@ class PluginRpcDispatcher(dispatcher.RpcDispatcher): tenant_id = rpc_ctxt_dict.pop('tenant_id', None) if not tenant_id: tenant_id = rpc_ctxt_dict.pop('project_id', None) - neutron_ctxt = context.Context(user_id, tenant_id, **rpc_ctxt_dict) + neutron_ctxt = context.Context(user_id, tenant_id, + load_admin_roles=False, **rpc_ctxt_dict) return super(PluginRpcDispatcher, self).dispatch( neutron_ctxt, version, method, namespace, **kwargs)