openstack
/
oslo.policy
Code Issues Proposed changes

Merge "Add debug log in pick_default_policy_file"

This commit is contained in:
Zuul 2021-04-16 16:59:32 +00:00 committed by Gerrit Code Review
parent 092e638310 b7489eb75a
commit 92eae81048
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
oslo_policy/policy.py
View File

@ -371,15 +371,25 @@ def pick_default_policy_file(conf, fallback_to_json_file=True):
new_default_policy_file = 'policy.yaml'
old_default_policy_file = 'policy.json'
policy_file = None
if ((conf.oslo_policy.policy_file == new_default_policy_file) and
fallback_to_json_file):
location = conf.get_location('policy_file', 'oslo_policy').location
if conf.find_file(conf.oslo_policy.policy_file):
return conf.oslo_policy.policy_file
policy_file = conf.oslo_policy.policy_file
elif location in [cfg.Locations.opt_default,
cfg.Locations.set_default]:
LOG.debug('Searching old policy.json file.')
if conf.find_file(old_default_policy_file):
return old_default_policy_file
policy_file = old_default_policy_file
if policy_file:
LOG.debug(
'Picking default policy file: %s. Config location: %s',
policy_file, location)
return policy_file
LOG.debug(
'No default policy file present, picking the configured '
'one: %s.', conf.oslo_policy.policy_file)
# Return overridden policy file
return conf.oslo_policy.policy_file