diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-07 05:41:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-07 05:41:57 +0000 |
| commit | ee3d2a190844b7b0493545c6e6967cfdf520a67d (patch) | |
| tree | 5ada6a336288e02f6d70495128cad7434e943976 /nova/policy.py | |
| parent | d4dd0842b63ff3bbe0f51f3e222c0d852df79f9c (diff) | |
| parent | 637e805634b5179ffacad57ee26d4175449537f5 (diff) | |
| download | nova-ee3d2a190844b7b0493545c6e6967cfdf520a67d.tar.gz nova-ee3d2a190844b7b0493545c6e6967cfdf520a67d.tar.xz nova-ee3d2a190844b7b0493545c6e6967cfdf520a67d.zip | |
Merge "Switch from FLAGS to CONF in misc modules"
Diffstat (limited to 'nova/policy.py')
| -rw-r--r-- | nova/policy.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/nova/policy.py b/nova/policy.py index c9555fbf7..9506635e9 100644 --- a/nova/policy.py +++ b/nova/policy.py @@ -19,6 +19,7 @@ import os.path +from nova import config from nova import exception from nova import flags from nova.openstack.common import cfg @@ -35,8 +36,8 @@ policy_opts = [ help=_('Rule checked when requested rule is not found')), ] -FLAGS = flags.FLAGS -FLAGS.register_opts(policy_opts) +CONF = config.CONF +CONF.register_opts(policy_opts) _POLICY_PATH = None _POLICY_CACHE = {} @@ -54,17 +55,17 @@ def init(): global _POLICY_PATH global _POLICY_CACHE if not _POLICY_PATH: - _POLICY_PATH = FLAGS.policy_file + _POLICY_PATH = CONF.policy_file if not os.path.exists(_POLICY_PATH): - _POLICY_PATH = FLAGS.find_file(_POLICY_PATH) + _POLICY_PATH = CONF.find_file(_POLICY_PATH) if not _POLICY_PATH: - raise exception.ConfigNotFound(path=FLAGS.policy_file) + raise exception.ConfigNotFound(path=CONF.policy_file) utils.read_cached_file(_POLICY_PATH, _POLICY_CACHE, reload_func=_set_rules) def _set_rules(data): - default_rule = FLAGS.policy_default_rule + default_rule = CONF.policy_default_rule policy.set_rules(policy.Rules.load_json(data, default_rule)) |