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

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)

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)