openstack/nova
Code Issues Proposed changes

Spice proxy config setting to be read from the spice group in nova.conf

Browse Source 
All spice configuration should be read from the spice group
in the nova config. As it's currently being done in the nova.spice
module.
Renaming spicehtml5proxy_{host, port} parameters to
html5proxy_{host, port}

DocImpact
Change-Id: I36c014c8b8a0796cda494f9450a1fc30104504a1
Closes-Bug: #1308418
This commit is contained in:
Vladik Romanovsky
2014-04-18 15:14:46 +00:00
parent 468b24b43b
commit fe02cc830f
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
nova/cmd/spicehtml5proxy.py
View File

@@ -31,16 +31,20 @@ from nova.openstack.common.report import guru_meditation_report as gmr
from nova import version
opts = [
cfg.StrOpt('spicehtml5proxy_host',
cfg.StrOpt('html5proxy_host',
default='0.0.0.0',
help='Host on which to listen for incoming requests'),
cfg.IntOpt('spicehtml5proxy_port',
help='Host on which to listen for incoming requests',
deprecated_group='DEFAULT',
deprecated_name='spicehtml5proxy_host'),
cfg.IntOpt('html5proxy_port',
default=6082,
help='Port on which to listen for incoming requests'),
help='Port on which to listen for incoming requests',
deprecated_group='DEFAULT',
deprecated_name='spicehtml5proxy_port'),
]
CONF = cfg.CONF
CONF.register_cli_opts(opts)
CONF.register_cli_opts(opts, group='spice')
CONF.import_opt('record', 'nova.cmd.novnc')
CONF.import_opt('daemon', 'nova.cmd.novnc')
CONF.import_opt('ssl_only', 'nova.cmd.novnc')
@@ -67,8 +71,8 @@ def main():
# Create and start the NovaWebSockets proxy
server = websocketproxy.NovaWebSocketProxy(
listen_host=CONF.spicehtml5proxy_host,
listen_port=CONF.spicehtml5proxy_port,
listen_host=CONF.spice.html5proxy_host,
listen_port=CONF.spice.html5proxy_port,
source_is_ipv6=CONF.source_is_ipv6,
verbose=CONF.verbose,
cert=CONF.cert,