summaryrefslogtreecommitdiffstats
path: root/bin/nova-spicehtml5proxy
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-02-20 08:50:18 +0000
committerGerrit Code Review <review@openstack.org>2013-02-20 08:50:18 +0000
commite37e02870216ea6de130ce3d1b2e8f642de9faf6 (patch)
treed3eef37cf671a7879303d3f693e8621c75377fe3 /bin/nova-spicehtml5proxy
parent512490200e009bce3cb155fcea683e9776d67658 (diff)
parent706a1370056ffccc2c8811fc1ac0679944564ece (diff)
downloadnova-e37e02870216ea6de130ce3d1b2e8f642de9faf6.tar.gz
nova-e37e02870216ea6de130ce3d1b2e8f642de9faf6.tar.xz
nova-e37e02870216ea6de130ce3d1b2e8f642de9faf6.zip
Merge "Use oslo-config-2013.1b4"
Diffstat (limited to 'bin/nova-spicehtml5proxy')
-rwxr-xr-xbin/nova-spicehtml5proxy3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/nova-spicehtml5proxy b/bin/nova-spicehtml5proxy
index 405092942..23d250ca3 100755
--- a/bin/nova-spicehtml5proxy
+++ b/bin/nova-spicehtml5proxy
@@ -24,9 +24,10 @@ SPICE HTML5 consoles. Leverages websockify.py by Joel Martin
import os
import sys
+from oslo.config import cfg
+
from nova import config
from nova.console import websocketproxy
-from nova.openstack.common import cfg
opts = [