openstack
/
glance
Code Issues Proposed changes

Merge "Update deprecated show_multiple_locations helptext"

This commit is contained in:
Jenkins 2017-02-01 05:13:06 +00:00 committed by Gerrit Code Review
parent a77ca91133 bd5a23df09
commit 967303d5e9
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
glance/common/config.py
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=_("""

11
releasenotes/notes/update-show_multiple_locations-helptext-7fa692642b6b6d52.yaml Normal file
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