summaryrefslogtreecommitdiff
path: root/nova/vnc/xvp_proxy.py
diff options
context:
space:
mode:
Diffstat (limited to 'nova/vnc/xvp_proxy.py')
-rw-r--r--nova/vnc/xvp_proxy.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/vnc/xvp_proxy.py b/nova/vnc/xvp_proxy.py
index 947b91d11c..59b80994b8 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)