From 86efeab80fb08ce50540df54ad1dc3195fee44ea Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Sun, 10 Nov 2024 21:49:27 -0800 Subject: [PATCH] Remove default override for config options policy_file olso.policy 4.5.0[1] changed the config options policy_file default value to 'policy.yaml', which means it is changed for all the OpenStack services and they do not need to override the default anymore. NOTE: There is no change in behaviour here, oslo.policy provides the same configuration that services have overridden till now. [1] https://review.opendev.org/c/openstack/releases/+/934012 https://review.opendev.org/c/openstack/requirements/+/934295 Change-Id: Ia480dbb113d407312f9a82794826da9ba5fce463 --- neutron_lib/policy/_engine.py | 6 +----- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/neutron_lib/policy/_engine.py b/neutron_lib/policy/_engine.py index b2ae2f70a..226729080 100644 --- a/neutron_lib/policy/_engine.py +++ b/neutron_lib/policy/_engine.py @@ -23,11 +23,7 @@ _ADVSVC_CTX_POLICY = 'context_is_advsvc' _SERVICE_ROLE = 'service_api' -# TODO(gmann): Remove setting the default value of config policy_file -# once oslo_policy change the default value to 'policy.yaml'. -# https://github.com/openstack/oslo.policy/blob/a626ad12fe5a3abd49d70e3e5b95589d279ab578/oslo_policy/opts.py#L49 -DEFAULT_POLICY_FILE = 'policy.yaml' -opts.set_defaults(cfg.CONF, DEFAULT_POLICY_FILE) +opts.set_defaults(cfg.CONF) _BASE_RULES = [ diff --git a/requirements.txt b/requirements.txt index 7c0315564..8acba4f45 100644 --- a/requirements.txt +++ b/requirements.txt @@ -17,7 +17,7 @@ oslo.db>=12.1.0 # Apache-2.0 oslo.i18n>=3.20.0 # Apache-2.0 oslo.log>=4.3.0 # Apache-2.0 oslo.messaging>=14.2.0 # Apache-2.0 -oslo.policy>=4.3.0 # Apache-2.0 +oslo.policy>=4.5.0 # Apache-2.0 oslo.serialization>=2.25.0 # Apache-2.0 oslo.service>=1.24.0 # Apache-2.0 oslo.utils>=7.0.0 # Apache-2.0