From f3f415ddd63ffca45d8a70e379a49718a47e4fef Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Thu, 25 Feb 2016 15:40:26 -0500 Subject: [PATCH] Update the help for deprecated glance host/port/protocol options The options are deprecated for removal but the help text doesn't say what to use instead, we should add that information. Change-Id: I8c973e9f325f5b732d827a702a98eff8ca56cbd7 --- nova/image/glance.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/nova/image/glance.py b/nova/image/glance.py index 87a8b4cf56..777c6a655d 100644 --- a/nova/image/glance.py +++ b/nova/image/glance.py @@ -50,21 +50,24 @@ glance_opts = [ default='$my_ip', # TODO(sdague): remove in N deprecated_for_removal=True, - help='Glance server hostname or IP address'), + help='DEPRECATED: Glance server hostname or IP address. ' + 'Use the "api_servers" option instead.'), cfg.IntOpt('port', default=9292, min=1, max=65535, # TODO(sdague): remove in N deprecated_for_removal=True, - help='Glance server port'), + help='DEPRECATED: Glance server port. Use the "api_servers" ' + 'option instead.'), cfg.StrOpt('protocol', default='http', choices=('http', 'https'), # TODO(sdague): remove in N deprecated_for_removal=True, - help='Protocol to use when connecting to glance. ' - 'Set to https for SSL.'), + help='DEPRECATED: Protocol to use when connecting to glance. ' + 'Set to https for SSL. Use the "api_servers" option ' + 'instead.'), cfg.ListOpt('api_servers', help=''' A list of the glance api servers endpoints available to nova. These