summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-03-05 18:37:11 +0000
committerGerrit Code Review <review@openstack.org>2015-03-05 18:37:11 +0000
commited84f7795b16f5da1d2c34f2299cf66194d970ad (patch)
treee767b80d668ecfd5143ccf51668d3e3511421728
parent33be3a7de458144a2b87c9539fd652fc9b386cd5 (diff)
parentd391fd1fef1b9a57ef11ad0c170ec9be6b63fa4f (diff)
downloadoslo-policy-ed84f7795b16f5da1d2c34f2299cf66194d970ad.tar.gz
Merge "deprecate policy_dirs option"0.3.0
-rw-r--r--oslo_policy/opts.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/oslo_policy/opts.py b/oslo_policy/opts.py
index d247e8a..af7d822 100644
--- a/oslo_policy/opts.py
+++ b/oslo_policy/opts.py
@@ -34,6 +34,7 @@ _options = [
help=_('Default rule. Enforced when a requested rule is not '
'found.'),
deprecated_group='DEFAULT'),
+ # NOTE(stevemar): Remove this option in the M cycle, refer to bug 1428332
cfg.MultiStrOpt('policy_dirs',
default=['policy.d'],
help=_('Directories where policy configuration files are '
@@ -43,7 +44,8 @@ _options = [
'policy_file must exist for these directories to '
'be searched. Missing or empty directories are '
'ignored.'),
- deprecated_group='DEFAULT'),
+ deprecated_group='DEFAULT',
+ deprecated_for_removal=True),
]