Merge "Remove deprecated opts from VNC conf"

Author: Zuul

nova/conf/vnc.py

@@ -39,10 +39,6 @@
     cfg.HostAddressOpt(
         'server_listen',
         default='127.0.0.1',
-        deprecated_opts=[
-            cfg.DeprecatedOpt('vncserver_listen', group='DEFAULT'),
-            cfg.DeprecatedOpt('vncserver_listen', group='vnc'),
-        ],
         help="""
 The IP address or hostname on which an instance should listen to for
 incoming VNC connection requests on this node.
@@ -51,11 +47,6 @@
     cfg.HostAddressOpt(
         'server_proxyclient_address',
         default='127.0.0.1',
-        deprecated_opts=[
-            cfg.DeprecatedOpt('vncserver_proxyclient_address',
-                              group='DEFAULT'),
-            cfg.DeprecatedOpt('vncserver_proxyclient_address', group='vnc'),
-        ],
         help="""
 Private, internal IP address or hostname of VNC console proxy.
 

releasenotes/notes/remove-deprecated-vnc-opts-c2bbcbf0fb777593.yaml

@@ -0,0 +1,10 @@
+---
+upgrade:
+  - |
+    vnc-related config options were deprecated in Pike release and now has been
+    removed:
+
+    - ``vncserver_listen`` opt removed, now we use only server_listen to bind
+      vnc address opt.
+    - ``vncserver_proxyclient_address`` opt removed, now we use only
+      server_proxyclient_address opt.