summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuangyu Suo <guangyu@unitedstack.com>2013-06-14 01:35:46 +0800
committerGuangyu Suo <guangyu@unitedstack.com>2013-06-14 01:50:43 +0800
commite50f14c098ebe3883e7dcc0ea001f274c6dd3fa3 (patch)
treeed546dcdbb519174f8ca1a3ea2171b639ac29be8
parent77595f8e08a61507ad5c7c990651fd4f8131c150 (diff)
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
-rw-r--r--nova/cmd/novncproxy.py2
1 files changed, 1 insertions, 1 deletions
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):