From: Alessio Ababilov <aababilo@yahoo-inc.com>
Date: Tue, 5 Feb 2013 13:53:38 +0000 (+0200)
Subject: Use policy_file parameter in quantum.policy
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=a4c107684a9a7769f226e7520f64511b0cfe2b75;p=openstack-build%2Fneutron-build.git

Use policy_file parameter in quantum.policy

quantum.policy depends on configuration parameter `policy_file'
that is defined in quantum.common.context.

Tests from tests/unit/test_policy.py fail without this import.

Fixes: bug #1116263
Change-Id: Iba4792acb0fb6b34b4ebc99fec7bc729cdb306da
---

diff --git a/quantum/policy.py b/quantum/policy.py
index 48e0e0b1e..84490132e 100644
--- a/quantum/policy.py
+++ b/quantum/policy.py
@@ -30,6 +30,7 @@ from quantum.openstack.common import policy
 LOG = logging.getLogger(__name__)
 _POLICY_PATH = None
 _POLICY_CACHE = {}
+cfg.CONF.import_opt('policy_file', 'quantum.common.config')
 
 
 def reset():