]> git.proxmox.com Git - mirror_novnc.git/commitdiff
Changed the config module which includes CONF
authorNikhil Komawar <nikhil.komawar@rackspace.com>
Fri, 30 Nov 2012 16:50:57 +0000 (11:50 -0500)
committerNikhil Komawar <nikhil.komawar@rackspace.com>
Fri, 30 Nov 2012 16:50:57 +0000 (11:50 -0500)
currently CONF was attempted of being imported from nova config.py
rather than openstack/common/cfg.py. this commit fixes that.

utils/nova-novncproxy

index 27bf298f18f3031fdbe7c7da040ab69e2bfeb855..c3afe44dc045a276c8d746f083d94a11ccd27398 100755 (executable)
@@ -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