Raise proper exception if policy file do not exist

Fixes bug 1022966.

Change-Id: Ia1f9a95eb9e956d0d65efb50e674de18d0552b6e

diff --git a/quantum/common/config.py b/quantum/common/config.py
index 73f5a8926c3639e890af9dca223bcf592dfc6142..2fe9590f013f4841c3fddb5dcf2115d07303dba4 100644 (file)
--- a/quantum/common/config.py
+++ b/quantum/common/config.py
@@ -37,6 +37,7 @@ bind_opts = [
     cfg.IntOpt('bind_port', default=9696),
     cfg.StrOpt('api_paste_config', default="api-paste.ini"),
     cfg.StrOpt('api_extensions_path', default=""),
+    cfg.StrOpt('policy_file', default="policy.json"),
     cfg.StrOpt('core_plugin',
                default='quantum.plugins.sample.SamplePlugin.FakePlugin'),
     cfg.StrOpt('base_mac', default="fa:16:3e:00:00:00"),

diff --git a/quantum/policy.py b/quantum/policy.py
index f53dff6f9f0b9f6171ac4b5e40d9eccb956c96e1..a91c28b9c41a527b404b53bab7d1f15f3650776d 100644 (file)
--- a/quantum/policy.py
+++ b/quantum/policy.py
@@ -23,6 +23,7 @@ import os.path
 
 from quantum.common import exceptions
 from quantum.common.utils import find_config_file
+from quantum.openstack.common import cfg
 from quantum.openstack.common import policy
 
 
@@ -38,9 +39,9 @@ def reset():
 def init():
     global _POLICY_PATH
     if not _POLICY_PATH:
-        _POLICY_PATH = find_config_file({}, 'policy.json')
+        _POLICY_PATH = find_config_file({}, cfg.CONF.policy_file)
         if not _POLICY_PATH:
-            raise exceptions.PolicyNotFound(path=FLAGS.policy_file)
+            raise exceptions.PolicyNotFound(path=cfg.CONF.policy_file)
     with open(_POLICY_PATH) as f:
         _set_brain(f.read())