Merge "Remove deprecated opts from VNC conf"
This commit is contained in:
commit
7bb2172317
|
@ -39,10 +39,6 @@ Guests will get created with graphical devices to support this. Clients
|
||||||
cfg.HostAddressOpt(
|
cfg.HostAddressOpt(
|
||||||
'server_listen',
|
'server_listen',
|
||||||
default='127.0.0.1',
|
default='127.0.0.1',
|
||||||
deprecated_opts=[
|
|
||||||
cfg.DeprecatedOpt('vncserver_listen', group='DEFAULT'),
|
|
||||||
cfg.DeprecatedOpt('vncserver_listen', group='vnc'),
|
|
||||||
],
|
|
||||||
help="""
|
help="""
|
||||||
The IP address or hostname on which an instance should listen to for
|
The IP address or hostname on which an instance should listen to for
|
||||||
incoming VNC connection requests on this node.
|
incoming VNC connection requests on this node.
|
||||||
|
@ -51,11 +47,6 @@ incoming VNC connection requests on this node.
|
||||||
cfg.HostAddressOpt(
|
cfg.HostAddressOpt(
|
||||||
'server_proxyclient_address',
|
'server_proxyclient_address',
|
||||||
default='127.0.0.1',
|
default='127.0.0.1',
|
||||||
deprecated_opts=[
|
|
||||||
cfg.DeprecatedOpt('vncserver_proxyclient_address',
|
|
||||||
group='DEFAULT'),
|
|
||||||
cfg.DeprecatedOpt('vncserver_proxyclient_address', group='vnc'),
|
|
||||||
],
|
|
||||||
help="""
|
help="""
|
||||||
Private, internal IP address or hostname of VNC console proxy.
|
Private, internal IP address or hostname of VNC console proxy.
|
||||||
|
|
||||||
|
|
|
@ -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.
|
Loading…
Reference in New Issue