openstack/glance
Code Issues Proposed changes

Merge "Add deprecation message to policy "default" rule"

Browse Source
This commit is contained in:
Zuul 2020-04-08 11:49:38 +00:00 committed by Gerrit Code Review
commit 3b990c9c12
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
glance/policies/base.py
View File

@ -17,7 +17,19 @@ rules = [
policy.RuleDefault(name='default', check_str='', policy.RuleDefault(name='default', check_str='',
description='Defines the default rule used for ' description='Defines the default rule used for '
'policies that historically had an empty ' 'policies that historically had an empty '
'policy in the supplied policy.json file.'), 'policy in the supplied policy.json file.',
deprecated_rule=policy.DeprecatedRule(
name='default',
check_str='role:admin'),
deprecated_reason='In order to allow operators to '
'accept the default policies from code by not defining '
'them in the policy file, while still working with old '
'policy files that rely on the ``default`` rule for '
'policies that are not specified in the policy file, '
'the ``default`` rule must now be explicitly set to '
'``"role:admin"`` when that is the desired default for '
'unspecified rules.',
deprecated_since='Ussuri'),
policy.RuleDefault(name='context_is_admin', check_str='role:admin', policy.RuleDefault(name='context_is_admin', check_str='role:admin',
description='Defines the rule for the is_admin:True ' description='Defines the rule for the is_admin:True '
'check.'), 'check.'),

2
lower-constraints.txt
View File

@ -69,7 +69,7 @@ oslo.i18n==3.15.3
oslo.log==3.36.0 oslo.log==3.36.0
oslo.messaging==5.29.0 oslo.messaging==5.29.0
oslo.middleware==3.31.0 oslo.middleware==3.31.0
oslo.policy==1.30.0 oslo.policy==2.4.1
oslo.reports==1.18.0 oslo.reports==1.18.0
oslo.serialization==2.25.0 oslo.serialization==2.25.0
oslo.service==1.30.0 oslo.service==1.30.0

2
requirements.txt
View File

@ -42,7 +42,7 @@ oslo.log>=3.36.0 # Apache-2.0
oslo.messaging>=5.29.0,!=9.0.0 # Apache-2.0 oslo.messaging>=5.29.0,!=9.0.0 # Apache-2.0
oslo.middleware>=3.31.0 # Apache-2.0 oslo.middleware>=3.31.0 # Apache-2.0
oslo.reports>=1.18.0 # Apache-2.0 oslo.reports>=1.18.0 # Apache-2.0
oslo.policy>=1.30.0 # Apache-2.0 oslo.policy>=2.4.1 # Apache-2.0
retrying!=1.3.0,>=1.2.3 # Apache-2.0 retrying!=1.3.0,>=1.2.3 # Apache-2.0
osprofiler>=1.4.0 # Apache-2.0 osprofiler>=1.4.0 # Apache-2.0