Merge "Add "vnc" option group for sample nova.conf file"

This commit is contained in:
Jenkins 2015-12-10 01:06:08 +00:00 committed by Gerrit Code Review
commit 24b8aeafd5
1 changed files with 1 additions and 1 deletions

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,
@ -131,6 +130,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)
]