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/vnc | |
| parent | e60d593b5ec254bb74fca39db7164f57db90be47 (diff) | |
| download | nova-94d87bce212f91c54370784a5544f1a07625938a.tar.gz nova-94d87bce212f91c54370784a5544f1a07625938a.tar.xz nova-94d87bce212f91c54370784a5544f1a07625938a.zip | |
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/vnc')
| -rw-r--r-- | nova/vnc/__init__.py | 3 | ||||
| -rw-r--r-- | nova/vnc/xvp_proxy.py | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/nova/vnc/__init__.py b/nova/vnc/__init__.py index ffc93abcd..4b9058eb7 100644 --- a/nova/vnc/__init__.py +++ b/nova/vnc/__init__.py @@ -18,7 +18,6 @@ """Module for VNC Proxying.""" -from nova import config from nova.openstack.common import cfg @@ -46,5 +45,5 @@ vnc_opts = [ help='keymap for vnc'), ] -CONF = config.CONF +CONF = cfg.CONF CONF.register_opts(vnc_opts) diff --git a/nova/vnc/xvp_proxy.py b/nova/vnc/xvp_proxy.py index 947b91d11..59b80994b 100644 --- a/nova/vnc/xvp_proxy.py +++ b/nova/vnc/xvp_proxy.py @@ -26,7 +26,6 @@ import eventlet.green import eventlet.greenio import eventlet.wsgi -from nova import config from nova.consoleauth import rpcapi as consoleauth_rpcapi from nova import context from nova.openstack.common import cfg @@ -46,7 +45,7 @@ xvp_proxy_opts = [ help='Address that the XCP VNC proxy should bind to'), ] -CONF = config.CONF +CONF = cfg.CONF CONF.register_opts(xvp_proxy_opts) |