summaryrefslogtreecommitdiffstats
path: root/bin/nova-spicehtml5proxy
diff options
context:
space:
mode:
authorJoe Gordon <jogo@cloudscaling.com>2013-01-17 18:06:53 -0500
committerJoe Gordon <jogo@cloudscaling.com>2013-01-24 09:52:58 -0500
commit4845fc2720a0ab3ff4f15fc8f3f00573b617ce5b (patch)
tree4d8a01e2b9591c39eb3aa93b92be8c6e6df4783d /bin/nova-spicehtml5proxy
parent4220e0110e1e45a1886d8a8b186aa4cdc2ef9455 (diff)
Fix hacking N302 import only modules
* Includes some general tools/hacking cleanup * Fix several N302 cases * Disable N302 until all cases are fixed Change-Id: Iddba07ff13e10dc41a6930749044bb8c0572d279
Diffstat (limited to 'bin/nova-spicehtml5proxy')
-rwxr-xr-xbin/nova-spicehtml5proxy5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/nova-spicehtml5proxy b/bin/nova-spicehtml5proxy
index 089ff9d71..161ccee7c 100755
--- a/bin/nova-spicehtml5proxy
+++ b/bin/nova-spicehtml5proxy
@@ -25,7 +25,7 @@ import os
import sys
from nova import config
-from nova.console import websocketproxy as ws
+from nova import console
from nova.openstack.common import cfg
@@ -77,7 +77,8 @@ if __name__ == '__main__':
sys.exit(-1)
# Create and start the NovaWebSockets proxy
- server = ws.NovaWebSocketProxy(listen_host=CONF.spicehtml5proxy_host,
+ server = console.websocketproxy.NovaWebSocketProxy(
+ listen_host=CONF.spicehtml5proxy_host,
listen_port=CONF.spicehtml5proxy_port,
source_is_ipv6=CONF.source_is_ipv6,
verbose=CONF.verbose,