From 902c6fb37feb4eff199c80909b6410ae85b757d7 Mon Sep 17 00:00:00 2001
From: Nikhil Komawar <nikhil.komawar@rackspace.com>
Date: Fri, 30 Nov 2012 11:50:57 -0500
Subject: [PATCH] Changed the config module which includes CONF

currently CONF was attempted of being imported from nova config.py
rather than openstack/common/cfg.py. this commit fixes that.
---
 utils/nova-novncproxy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/nova-novncproxy b/utils/nova-novncproxy
index 27bf298f..c3afe44d 100755
--- a/utils/nova-novncproxy
+++ b/utils/nova-novncproxy
@@ -64,7 +64,7 @@ opts = [
                default=6080,
                help='Port on which to listen for incoming requests'),
     ]
-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_cli_opts(opts)
 
 # As of nova commit 0b11668e64450039dc071a4a123abd02206f865f we must