From e50f14c098ebe3883e7dcc0ea001f274c6dd3fa3 Mon Sep 17 00:00:00 2001
From: Guangyu Suo <guangyu@unitedstack.com>
Date: Fri, 14 Jun 2013 01:35:46 +0800
Subject: Fix the wrong reference by CONF

CONF.set_defaults(CONF, web='/usr/share/novnc') should be
CONF.set_default('web', '/usr/share/novnc')

Fixes: bug #1190628
Change-Id: I7ff12d10ed423fa6518b8674b80d0e1cc1787a8b
---
 nova/cmd/novncproxy.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/cmd/novncproxy.py b/nova/cmd/novncproxy.py
index 2abba7c90..21d878651 100644
--- a/nova/cmd/novncproxy.py
+++ b/nova/cmd/novncproxy.py
@@ -51,7 +51,7 @@ CONF.import_opt('web', 'nova.cmd.novnc')
 
 def main():
     # Setup flags
-    CONF.set_defaults(CONF, web='/usr/share/novnc')
+    CONF.set_default('web', '/usr/share/novnc')
     config.parse_args(sys.argv)
 
     if CONF.ssl_only and not os.path.exists(CONF.cert):
-- 
cgit