openstack
/
nova
Code Issues Proposed changes

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 68200d7585)
This commit is contained in:
Shunya Kitada 2015-10-15 23:33:32 +09:00 committed by Dirk Mueller
parent 26b8b6d60b
commit 6ba4803a0d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/opts.py
View File

@ -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)
]