Browse Source

Merge pull request #216 from komawar/config-module

Changed the config module which includes CONF
Joel Martin 12 years ago
parent
commit
d55f5377bb
1 changed files with 1 additions and 1 deletions
  1. 1 1
      utils/nova-novncproxy

+ 1 - 1
utils/nova-novncproxy

@@ -64,7 +64,7 @@ opts = [
                default=6080,
                default=6080,
                help='Port on which to listen for incoming requests'),
                help='Port on which to listen for incoming requests'),
     ]
     ]
-CONF = config.CONF
+CONF = cfg.CONF
 CONF.register_cli_opts(opts)
 CONF.register_cli_opts(opts)
 
 
 # As of nova commit 0b11668e64450039dc071a4a123abd02206f865f we must
 # As of nova commit 0b11668e64450039dc071a4a123abd02206f865f we must