diff --git a/nova/policy.py b/nova/policy.py index 2f7111aea0..18198eed63 100644 --- a/nova/policy.py +++ b/nova/policy.py @@ -42,14 +42,12 @@ saved_file_rules = [] KEY_EXPR = re.compile(r'%\((\w+)\)s') # TODO(gmann): Remove overriding the default value of config options -# 'policy_file', 'enforce_scope', and 'enforce_new_defaults' once -# oslo_policy change their default value to what is overridden here. +# 'policy_file' once oslo_policy change its default value to what +# is overridden here. DEFAULT_POLICY_FILE = 'policy.yaml' opts.set_defaults( cfg.CONF, - DEFAULT_POLICY_FILE, - enforce_scope=True, - enforce_new_defaults=True) + DEFAULT_POLICY_FILE) def reset(): diff --git a/requirements.txt b/requirements.txt index eb158af1c0..df7cf06712 100644 --- a/requirements.txt +++ b/requirements.txt @@ -42,7 +42,7 @@ oslo.utils>=4.12.1 # Apache-2.0 oslo.db>=10.0.0 # Apache-2.0 oslo.rootwrap>=5.15.0 # Apache-2.0 oslo.messaging>=14.1.0 # Apache-2.0 -oslo.policy>=3.11.0 # Apache-2.0 +oslo.policy>=4.4.0 # Apache-2.0 oslo.privsep>=2.6.2 # Apache-2.0 oslo.i18n>=5.1.0 # Apache-2.0 oslo.service>=2.8.0 # Apache-2.0