diff options
| author | Vladik Romanovsky <vladik.romanovsky@enovance.com> | 2014-04-18 15:14:46 +0000 |
|---|---|---|
| committer | Vladik Romanovsky <vladik.romanovsky@enovance.com> | 2014-04-23 13:28:10 -0400 |
| commit | fe02cc830f9c9e1dac234164bc1f0caa0e2072d7 (patch) | |
| tree | 1d41ba5e110d9a475f7e30b9a9f567f095e7eb1c /nova/cmd | |
| parent | 468b24b43b768e50c0fd96430ded853a45e5925c (diff) | |
| download | nova-fe02cc830f9c9e1dac234164bc1f0caa0e2072d7.tar.gz | |
Spice proxy config setting to be read from the spice group in nova.conf
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
Diffstat (limited to 'nova/cmd')
| -rw-r--r-- | nova/cmd/spicehtml5proxy.py | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/nova/cmd/spicehtml5proxy.py b/nova/cmd/spicehtml5proxy.py index a4b913aee2..38bd6b7a9b 100644 --- a/nova/cmd/spicehtml5proxy.py +++ b/nova/cmd/spicehtml5proxy.py @@ -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, |