From: Eugene Nikanorov <enikanorov@mirantis.com>
Date: Thu, 28 Nov 2013 08:46:41 +0000 (+0400)
Subject: Avoid loading policy when processing rpc requests
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=572ca29a0c8d8c832b2fa45895f4b58fd74d2fba;p=openstack-build%2Fneutron-build.git

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
---

diff --git a/neutron/common/rpc.py b/neutron/common/rpc.py
index c2b5aae7f..643cf5934 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)