diff options
| author | Davanum Srinivas <dims@linux.vnet.ibm.com> | 2013-01-25 09:13:53 -0500 |
|---|---|---|
| committer | Davanum Srinivas <dims@linux.vnet.ibm.com> | 2013-01-25 09:18:23 -0500 |
| commit | 9ed200d3cdc6b21de9c8fa1271e4982eb45d231d (patch) | |
| tree | a60c815929d03196784b2eb8fdbf551279eb6097 /bin | |
| parent | 5143586775595145824e73e3a6df71c4845b1a20 (diff) | |
| download | nova-9ed200d3cdc6b21de9c8fa1271e4982eb45d231d.tar.gz nova-9ed200d3cdc6b21de9c8fa1271e4982eb45d231d.tar.xz nova-9ed200d3cdc6b21de9c8fa1271e4982eb45d231d.zip | |
Fix bad imports that cause nova-novncproxy to fail
Looks like it was introduced with
Iddba07ff13e10dc41a6930749044bb8c0572d279
Fixes LP# 1104907
Change-Id: Ie0c01af62a7fd20a6021b3c6fe89af88585e2fb2
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-novncproxy | 4 | ||||
| -rwxr-xr-x | bin/nova-spicehtml5proxy | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/bin/nova-novncproxy b/bin/nova-novncproxy index 7ddd2b26c..657f97b48 100755 --- a/bin/nova-novncproxy +++ b/bin/nova-novncproxy @@ -25,7 +25,7 @@ import os import sys from nova import config -from nova import console +from nova.console import websocketproxy from nova.openstack.common import cfg @@ -77,7 +77,7 @@ if __name__ == '__main__': sys.exit(-1) # Create and start the NovaWebSockets proxy - server = console.websocketproxy.NovaWebSocketProxy( + server = websocketproxy.NovaWebSocketProxy( listen_host=CONF.novncproxy_host, listen_port=CONF.novncproxy_port, source_is_ipv6=CONF.source_is_ipv6, diff --git a/bin/nova-spicehtml5proxy b/bin/nova-spicehtml5proxy index 161ccee7c..17f8cb7c2 100755 --- a/bin/nova-spicehtml5proxy +++ b/bin/nova-spicehtml5proxy @@ -25,7 +25,7 @@ import os import sys from nova import config -from nova import console +from nova.console import websocketproxy from nova.openstack.common import cfg @@ -77,7 +77,7 @@ if __name__ == '__main__': sys.exit(-1) # Create and start the NovaWebSockets proxy - server = console.websocketproxy.NovaWebSocketProxy( + server = websocketproxy.NovaWebSocketProxy( listen_host=CONF.spicehtml5proxy_host, listen_port=CONF.spicehtml5proxy_port, source_is_ipv6=CONF.source_is_ipv6, |