Merge "config options: Make xvp proxy into vnc group"

nova/opts.py

@@ -89,7 +89,6 @@ def list_opts():
              nova.service.service_opts,
              nova.utils.monkey_patch_opts,
              nova.utils.utils_opts,
-             nova.vnc.xvp_proxy.xvp_proxy_opts,
              nova.volume._volume_opts,
              nova.wsgi.wsgi_opts,
          )),
@@ -118,7 +117,11 @@ def list_opts():
              [nova.console.rpcapi.rpcapi_cap_opt],
              [nova.consoleauth.rpcapi.rpcapi_cap_opt],
          )),
-        ('vnc', nova.vnc.vnc_opts),
+        ('vnc',
+         itertools.chain(
+             nova.vnc.vnc_opts,
+             nova.vnc.xvp_proxy.xvp_proxy_opts,
+         )),
         ('workarounds', nova.utils.workarounds_opts),
         ('zookeeper', nova.servicegroup.drivers.zk.zk_driver_opts)
     ]

nova/vnc/xvp_proxy.py

@@ -41,14 +41,16 @@ xvp_proxy_opts = [
                default=6081,
                min=1,
                max=65535,
-               help='Port that the XCP VNC proxy should bind to'),
+               help='Port that the XCP VNC proxy should bind to',
+               deprecated_group='DEFAULT'),
     cfg.StrOpt('xvpvncproxy_host',
                default='0.0.0.0',
-               help='Address that the XCP VNC proxy should bind to'),
+               help='Address that the XCP VNC proxy should bind to',
+               deprecated_group='DEFAULT'),
     ]
 
 CONF = cfg.CONF
-CONF.register_opts(xvp_proxy_opts)
+CONF.register_opts(xvp_proxy_opts, group='vnc')
 
 
 class XCPVNCProxy(object):

releasenotes/notes/add-xvp-config-to-vnc-group-349cca99f05fcfd3.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - All VNC XVP configuration options have been added to the
+    'vnc' group. They should no longer be included in the
+    'DEFAULT' group.