diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-24 22:59:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-24 22:59:13 +0000 |
| commit | f9012e39ee5582192db9289d34df3adaddda2ad1 (patch) | |
| tree | d0c2debadde670b604fdd5cd2ec2cf42c249a769 /bin | |
| parent | 0364b173f9c2638b99619c29ada704a483626e4b (diff) | |
| parent | 4845fc2720a0ab3ff4f15fc8f3f00573b617ce5b (diff) | |
Merge "Fix hacking N302 import only modules"
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-novncproxy | 5 | ||||
| -rwxr-xr-x | bin/nova-spicehtml5proxy | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/bin/nova-novncproxy b/bin/nova-novncproxy index 477510b99..7ddd2b26c 100755 --- a/bin/nova-novncproxy +++ b/bin/nova-novncproxy @@ -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.novncproxy_host, + server = console.websocketproxy.NovaWebSocketProxy( + listen_host=CONF.novncproxy_host, listen_port=CONF.novncproxy_port, source_is_ipv6=CONF.source_is_ipv6, verbose=CONF.verbose, 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, |