diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2012-11-17 22:50:17 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2012-11-20 00:00:21 +0000 |
| commit | 94d87bce212f91c54370784a5544f1a07625938a (patch) | |
| tree | cfc91dedd5f26f53b3824603763bc63878607d1e /nova/cloudpipe | |
| parent | e60d593b5ec254bb74fca39db7164f57db90be47 (diff) | |
| download | nova-94d87bce212f91c54370784a5544f1a07625938a.tar.gz | |
Remove nova.config.CONF
Modules import nova.config for two reasons right now - firstly, to
reference nova.config.CONF and, secondly, if they use one of the
options defined in nova.config.
Often modules import nova.openstack.common.cfg and nova.config
which is a bit pointless since they could just use cfg.CONF if
they just want to nova.config in order to reference CONF.
Let's just use cfg.CONF everywhere and we can explicitly state
where we actually require options defined in nova.config.
Change-Id: Ie4184a74e3e78c99658becb18dce1c2087e450bb
Diffstat (limited to 'nova/cloudpipe')
| -rw-r--r-- | nova/cloudpipe/pipelib.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py index 5a74f1f8b0..5fa8dd7027 100644 --- a/nova/cloudpipe/pipelib.py +++ b/nova/cloudpipe/pipelib.py @@ -53,7 +53,7 @@ cloudpipe_opts = [ help=_('Netmask to push into openvpn config')), ] -CONF = config.CONF +CONF = cfg.CONF CONF.register_opts(cloudpipe_opts) CONF.import_opt('cnt_vpn_clients', 'nova.network.manager') |