diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-04-26 12:38:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-04-26 12:38:02 +0000 |
| commit | e2efa8fb899d920d5eb820d2c60ed7e69f39036a (patch) | |
| tree | 8825633dfce387e6fac8a017a12cd96d2dc63b10 | |
| parent | 25141fd36c4885fb2fa0590d15db9b8d563f1afb (diff) | |
| parent | 0db9ba5ce33d6ed132d09d8398555f7c540dc7b3 (diff) | |
| download | nova-e2efa8fb899d920d5eb820d2c60ed7e69f39036a.tar.gz nova-e2efa8fb899d920d5eb820d2c60ed7e69f39036a.tar.xz nova-e2efa8fb899d920d5eb820d2c60ed7e69f39036a.zip | |
Merge "Wrong proxy port in nova.conf for Spice proxy"
| -rw-r--r-- | doc/api_samples/os-consoles/get-spice-console-post-resp.xml | 2 | ||||
| -rw-r--r-- | etc/nova/nova.conf.sample | 4 | ||||
| -rw-r--r-- | nova/spice/__init__.py | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/doc/api_samples/os-consoles/get-spice-console-post-resp.xml b/doc/api_samples/os-consoles/get-spice-console-post-resp.xml index acba8b1f0..113b982af 100644 --- a/doc/api_samples/os-consoles/get-spice-console-post-resp.xml +++ b/doc/api_samples/os-consoles/get-spice-console-post-resp.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> <console> <type>spice-html5</type> - <url>http://example.com:6080/spice_auto.html?token=f9906a48-b71e-4f18-baca-c987da3ebdb3</url> + <url>http://example.com:6082/spice_auto.html?token=f9906a48-b71e-4f18-baca-c987da3ebdb3</url> </console> diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample index ed989ce86..4d8fabd00 100644 --- a/etc/nova/nova.conf.sample +++ b/etc/nova/nova.conf.sample @@ -2854,8 +2854,8 @@ # # location of spice html5 console proxy, in the form -# "http://127.0.0.1:6080/spice_auto.html" (string value) -#html5proxy_base_url=http://127.0.0.1:6080/spice_auto.html +# "http://127.0.0.1:6082/spice_auto.html" (string value) +#html5proxy_base_url=http://127.0.0.1:6082/spice_auto.html # IP address on which instance spice server should listen # (string value) diff --git a/nova/spice/__init__.py b/nova/spice/__init__.py index aa283d5cc..2f0d12289 100644 --- a/nova/spice/__init__.py +++ b/nova/spice/__init__.py @@ -22,9 +22,9 @@ from oslo.config import cfg spice_opts = [ cfg.StrOpt('html5proxy_base_url', - default='http://127.0.0.1:6080/spice_auto.html', + default='http://127.0.0.1:6082/spice_auto.html', help='location of spice html5 console proxy, in the form ' - '"http://127.0.0.1:6080/spice_auto.html"'), + '"http://127.0.0.1:6082/spice_auto.html"'), cfg.StrOpt('server_listen', default='127.0.0.1', help='IP address on which instance spice server should listen'), |