summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-04-26 12:38:02 +0000
committerGerrit Code Review <review@openstack.org>2013-04-26 12:38:02 +0000
commite2efa8fb899d920d5eb820d2c60ed7e69f39036a (patch)
tree8825633dfce387e6fac8a017a12cd96d2dc63b10 /nova
parent25141fd36c4885fb2fa0590d15db9b8d563f1afb (diff)
parent0db9ba5ce33d6ed132d09d8398555f7c540dc7b3 (diff)
downloadnova-e2efa8fb899d920d5eb820d2c60ed7e69f39036a.tar.gz
nova-e2efa8fb899d920d5eb820d2c60ed7e69f39036a.tar.xz
nova-e2efa8fb899d920d5eb820d2c60ed7e69f39036a.zip
Merge "Wrong proxy port in nova.conf for Spice proxy"
Diffstat (limited to 'nova')
-rw-r--r--nova/spice/__init__.py4
1 files changed, 2 insertions, 2 deletions
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'),