From 2cb30561416a499673c8a32cf7700963ca772da7 Mon Sep 17 00:00:00 2001 From: justin ljj Date: Wed, 11 Jul 2012 13:38:26 +0800 Subject: [PATCH] Raise proper exception if policy file do not exist Fixes bug 1022966. Change-Id: Ia1f9a95eb9e956d0d65efb50e674de18d0552b6e --- quantum/common/config.py | 1 + quantum/policy.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/quantum/common/config.py b/quantum/common/config.py index 73f5a8926..2fe9590f0 100644 --- 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 f53dff6f9..a91c28b9c 100644 --- 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()) -- 2.45.2