diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-09-30 11:11:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-09-30 11:11:32 +0000 |
| commit | 63a72010060222bbc41f3b397745a7f190588b1f (patch) | |
| tree | 53ba9de8114b94cbad8d777daf7eb66e91bcf9c5 | |
| parent | 80ce28e2776c178894b584dd795934354505b0d0 (diff) | |
| parent | 48e94bf75ce2be50d323e8b883cf3322c4d06c4e (diff) | |
| download | nova-63a72010060222bbc41f3b397745a7f190588b1f.tar.gz | |
Merge "cmd: update the default behavior of serial console"
| -rw-r--r-- | doc/api_samples/os-consoles/get-serial-console-post-resp.json | 2 | ||||
| -rw-r--r-- | doc/api_samples/os-consoles/get-serial-console-post-resp.xml | 2 | ||||
| -rw-r--r-- | nova/cmd/serialproxy.py | 7 | ||||
| -rw-r--r-- | nova/console/serial.py | 2 | ||||
| -rw-r--r-- | nova/tests/integrated/test_api_samples.py | 2 |
5 files changed, 4 insertions, 11 deletions
diff --git a/doc/api_samples/os-consoles/get-serial-console-post-resp.json b/doc/api_samples/os-consoles/get-serial-console-post-resp.json index 80df0e11dc..990c9653cc 100644 --- a/doc/api_samples/os-consoles/get-serial-console-post-resp.json +++ b/doc/api_samples/os-consoles/get-serial-console-post-resp.json @@ -1,6 +1,6 @@ { "console": { "type": "serial", - "url":"http://127.0.0.1:6083/?token=f9906a48-b71e-4f18-baca-c987da3ebdb3" + "url":"ws://127.0.0.1:6083/?token=f9906a48-b71e-4f18-baca-c987da3ebdb3" } } diff --git a/doc/api_samples/os-consoles/get-serial-console-post-resp.xml b/doc/api_samples/os-consoles/get-serial-console-post-resp.xml index 689a56d992..7216750b5f 100644 --- a/doc/api_samples/os-consoles/get-serial-console-post-resp.xml +++ b/doc/api_samples/os-consoles/get-serial-console-post-resp.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> <console> <type>serial</type> - <url>http://127.0.0.1:6083/?token=f9906a48-b71e-4f18-baca-c987da3ebdb3</url> + <url>ws://127.0.0.1:6083/?token=f9906a48-b71e-4f18-baca-c987da3ebdb3</url> </console> diff --git a/nova/cmd/serialproxy.py b/nova/cmd/serialproxy.py index 6e28bc1285..031a94c1ea 100644 --- a/nova/cmd/serialproxy.py +++ b/nova/cmd/serialproxy.py @@ -48,7 +48,6 @@ CONF.import_opt('ssl_only', 'nova.cmd.novnc') CONF.import_opt('source_is_ipv6', 'nova.cmd.novnc') CONF.import_opt('cert', 'nova.cmd.novnc') CONF.import_opt('key', 'nova.cmd.novnc') -CONF.import_opt('web', 'nova.cmd.novnc') def exit_with_error(msg, errno=-1): @@ -62,11 +61,6 @@ def main(): if CONF.ssl_only and not os.path.exists(CONF.cert): exit_with_error("SSL only and %s not found" % CONF.cert) - # Check to see if tty html/js/css files are present - if not os.path.exists(CONF.web): - exit_with_error("Can not find serial terminal " - "html/js files at %s." % CONF.web) - logging.setup("nova") gmr.TextGuruMeditation.setup_autorun(version) @@ -82,7 +76,6 @@ def main(): daemon=CONF.daemon, record=CONF.record, traffic=CONF.verbose and not CONF.daemon, - web=CONF.web, file_only=True, RequestHandlerClass=websocketproxy.NovaProxyRequestHandler) server.start_server() diff --git a/nova/console/serial.py b/nova/console/serial.py index 3125fd7829..dca25d02c4 100644 --- a/nova/console/serial.py +++ b/nova/console/serial.py @@ -39,7 +39,7 @@ serial_opts = [ help='Range of TCP ports to use for serial ports ' 'on compute hosts'), cfg.StrOpt('base_url', - default='http://127.0.0.1:6083/', + default='ws://127.0.0.1:6083/', help='Location of serial console proxy.'), cfg.StrOpt('listen', default='127.0.0.1', diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index b4b300c71e..6ea7e2db99 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -2127,7 +2127,7 @@ class ConsolesSampleJsonTests(ServersSampleBase): {'action': 'os-getSerialConsole'}) subs = self._get_regexes() subs["url"] = \ - "((https?):((//)|(\\\\))+([\w\d:#@%/;$()~_?\+-=\\\.&](#!)?)*)" + "((ws?):((//)|(\\\\))+([\w\d:#@%/;$()~_?\+-=\\\.&](#!)?)*)" self._verify_response('get-serial-console-post-resp', subs, response, 200) |