diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-20 02:02:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-20 02:02:50 +0000 |
| commit | 8c821c872cbec95bd48e68dc62c46030a097ce4f (patch) | |
| tree | fe38ad882ef665d78f85dce46dda716a89971f08 /nova/policy.py | |
| parent | 1251c02d1d3587e7762eaab1352d08cbf5baa3c4 (diff) | |
| parent | 94d87bce212f91c54370784a5544f1a07625938a (diff) | |
| download | nova-8c821c872cbec95bd48e68dc62c46030a097ce4f.tar.gz nova-8c821c872cbec95bd48e68dc62c46030a097ce4f.tar.xz nova-8c821c872cbec95bd48e68dc62c46030a097ce4f.zip | |
Merge "Remove nova.config.CONF"
Diffstat (limited to 'nova/policy.py')
| -rw-r--r-- | nova/policy.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/policy.py b/nova/policy.py index dc4bc7031..5a300cfb2 100644 --- a/nova/policy.py +++ b/nova/policy.py @@ -19,7 +19,6 @@ import os.path -from nova import config from nova import exception from nova.openstack.common import cfg from nova.openstack.common import policy @@ -35,7 +34,7 @@ policy_opts = [ help=_('Rule checked when requested rule is not found')), ] -CONF = config.CONF +CONF = cfg.CONF CONF.register_opts(policy_opts) _POLICY_PATH = None |