From af5ae1e3ca1188cfabf1b514b488c5aa6d3097c8 Mon Sep 17 00:00:00 2001
From: Terry Wilson <twilson@redhat.com>
Date: Tue, 20 Nov 2012 13:54:19 -0600
Subject: [PATCH] Grab CONF from the correct place

A recent change to Nova broke this again. This fixes the issue.
---
 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