From 6ba4803a0d667fc03d7daf0ab1684b3e81413f17 Mon Sep 17 00:00:00 2001 From: Shunya Kitada Date: Thu, 15 Oct 2015 23:33:32 +0900 Subject: [PATCH] Add "vnc" option group for sample nova.conf file There is no "[vnc]" section in nova.conf.sample generated by command "tox -egenconfig". In addition, the "[default]" section has vnc options. This patch moves vnc options from "[default]" section to "[vnc]" section. Change-Id: I5cf69729aa9e2bb868f26b82eaaa28187ce7a7a3 Closes-Bug: #1506356 (cherry picked from commit 68200d7585c384adb8a688376cc8e5e013395a34) --- nova/opts.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nova/opts.py b/nova/opts.py index ea72717a3174..b5a99ef22521 100644 --- a/nova/opts.py +++ b/nova/opts.py @@ -99,7 +99,6 @@ def list_opts(): nova.service.service_opts, nova.utils.monkey_patch_opts, nova.utils.utils_opts, - nova.vnc.vnc_opts, nova.vnc.xvp_proxy.xvp_proxy_opts, nova.volume._volume_opts, nova.wsgi.wsgi_opts, @@ -135,6 +134,7 @@ def list_opts(): [nova.console.rpcapi.rpcapi_cap_opt], [nova.consoleauth.rpcapi.rpcapi_cap_opt], )), + ('vnc', nova.vnc.vnc_opts), ('workarounds', nova.utils.workarounds_opts), ('zookeeper', nova.servicegroup.drivers.zk.zk_driver_opts) ]