From 11a42d40306f56105447a32cc521bb44f6678b59 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 19 Jan 2016 13:03:45 +0000 Subject: [PATCH] config options: Make noVNC proxy into vnc group Migrate all noVNC configuration into [vnc] group. Change-Id: I91a8d14a43571351b016d13700ca552826ad08ef --- nova/cmd/novncproxy.py | 12 +++++++----- ...c-proxy-config-to-vnc-group-f5bb68740f623744.yaml | 4 ++++ 2 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 releasenotes/notes/add-novnc-proxy-config-to-vnc-group-f5bb68740f623744.yaml diff --git a/nova/cmd/novncproxy.py b/nova/cmd/novncproxy.py index acd56925faab..4cae89171ba2 100644 --- a/nova/cmd/novncproxy.py +++ b/nova/cmd/novncproxy.py @@ -29,16 +29,18 @@ from nova import config opts = [ cfg.StrOpt('novncproxy_host', default='0.0.0.0', - help='Host on which to listen for incoming requests'), + help='Host on which to listen for incoming requests', + deprecated_group='DEFAULT'), cfg.IntOpt('novncproxy_port', default=6080, min=1, max=65535, - help='Port on which to listen for incoming requests'), + help='Port on which to listen for incoming requests', + deprecated_group='DEFAULT'), ] CONF = cfg.CONF -CONF.register_cli_opts(opts) +CONF.register_cli_opts(opts, 'vnc') def main(): @@ -47,5 +49,5 @@ def main(): config.parse_args(sys.argv) baseproxy.proxy( - host=CONF.novncproxy_host, - port=CONF.novncproxy_port) + host=CONF.vnc.novncproxy_host, + port=CONF.vnc.novncproxy_port) diff --git a/releasenotes/notes/add-novnc-proxy-config-to-vnc-group-f5bb68740f623744.yaml b/releasenotes/notes/add-novnc-proxy-config-to-vnc-group-f5bb68740f623744.yaml new file mode 100644 index 000000000000..4de0ba2b57a1 --- /dev/null +++ b/releasenotes/notes/add-novnc-proxy-config-to-vnc-group-f5bb68740f623744.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - All noVNC proxy configuration options have been added to the 'vnc' + group. They should no longer be included in the 'DEFAULT' group.