From bd5a23df095af9f2d5b21f3350674fb6e36abbe5 Mon Sep 17 00:00:00 2001 From: Brian Rosmaita Date: Fri, 27 Jan 2017 10:49:22 -0500 Subject: [PATCH] Update deprecated show_multiple_locations helptext This option will be mentioned in an upcoming OSSN. I think it will be confusing to operators if the option is removed now, and it will also be confusing if the text says "will be removed in the Ocata release". This patch changes the text to say "will be removed in the Pike release or later". Corresponding release note has been added. Co-Authored-By: Brian Rosmaita Co-Authored-By: Nikhil Komawar Change-Id: Ib599afaee8f48f141be125a4016aece1e40e36cf --- glance/common/config.py | 9 +++++---- ..._multiple_locations-helptext-7fa692642b6b6d52.yaml | 11 +++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 releasenotes/notes/update-show_multiple_locations-helptext-7fa692642b6b6d52.yaml diff --git a/glance/common/config.py b/glance/common/config.py index 2498619667..62b4157d5e 100644 --- a/glance/common/config.py +++ b/glance/common/config.py @@ -367,10 +367,11 @@ Related options: # related rules set to admin only once this option is finally removed. cfg.BoolOpt('show_multiple_locations', default=False, deprecated_for_removal=True, - deprecated_reason=_('This option will be removed in the Ocata ' - 'release because the same functionality ' - 'can be achieved with greater granularity ' - 'by using policies. Please see the Newton ' + deprecated_reason=_('This option will be removed in the Pike ' + 'release or later because the same ' + 'functionality can be achieved with ' + 'greater granularity by using policies. ' + 'Please see the Newton ' 'release notes for more information.'), deprecated_since='Newton', help=_(""" diff --git a/releasenotes/notes/update-show_multiple_locations-helptext-7fa692642b6b6d52.yaml b/releasenotes/notes/update-show_multiple_locations-helptext-7fa692642b6b6d52.yaml new file mode 100644 index 0000000000..8cd1958722 --- /dev/null +++ b/releasenotes/notes/update-show_multiple_locations-helptext-7fa692642b6b6d52.yaml @@ -0,0 +1,11 @@ +--- +other: + - | + The deprecation path for the configuration option + ``show_multiple_locations`` has been changed because + the mitigation instructions for `OSSN-0065`_ refer to + this option. It is now subject to removal on or after + the **Pike** release. The help text for this option + has been updated accordingly. + + .. _`OSSN-0065`: https://wiki.openstack.org/wiki/OSSN/OSSN-0065