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 <brian.rosmaita@rackspace.com>
Co-Authored-By: Nikhil Komawar <nik.komawar@gmail.com>

Change-Id: Ib599afaee8f48f141be125a4016aece1e40e36cf
This commit is contained in:
Brian Rosmaita 2017-01-27 10:49:22 -05:00 committed by Nikhil Komawar
parent 0108666f2b
commit bd5a23df09
2 changed files with 16 additions and 4 deletions

View File

@ -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=_("""

View File

@ -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