From 9289e6212cf54a4ce74c7615cf74892c6a70c50d Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Wed, 10 Aug 2016 16:00:53 -0400 Subject: [PATCH] vnc host options need to support hostnames When updating the config options the VNC options were switched from StrOpt to IPOpt. However these are hostnames, they even say so in the option name, so IPOpt is too restrictive, and could break folks in upgrade if they set these to hostnames. Change-Id: Ib2062407dcf9cba8676b0f38aa0c63df25cc7b38 Closes-Bug: #1611940 --- nova/conf/vnc.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nova/conf/vnc.py b/nova/conf/vnc.py index 87eb1031ce..c1a33e2293 100644 --- a/nova/conf/vnc.py +++ b/nova/conf/vnc.py @@ -56,7 +56,7 @@ Possible values: of supported keyboard layouts at ``/usr/share/qemu/keymaps``. """), - cfg.IPOpt( + cfg.StrOpt( 'vncserver_listen', default='127.0.0.1', deprecated_group='DEFAULT', @@ -65,7 +65,7 @@ The IP address on which an instance should listen to for incoming VNC connection requests on this node. """), - cfg.IPOpt( + cfg.StrOpt( 'vncserver_proxyclient_address', default='127.0.0.1', deprecated_group='DEFAULT', @@ -100,7 +100,7 @@ Related options: * novncproxy_port """), - cfg.IPOpt( + cfg.StrOpt( 'xvpvncproxy_host', default='0.0.0.0', deprecated_group='DEFAULT', @@ -169,7 +169,7 @@ Related options: ] CLI_OPTS = [ - cfg.IPOpt( + cfg.StrOpt( 'novncproxy_host', default='0.0.0.0', deprecated_group='DEFAULT',