Merge "deprecate policy_dirs option"

This commit is contained in:
Jenkins 2015-03-05 18:37:11 +00:00 committed by Gerrit Code Review
commit ed84f7795b

View File

@ -34,6 +34,7 @@ _options = [
help=_('Default rule. Enforced when a requested rule is not ' help=_('Default rule. Enforced when a requested rule is not '
'found.'), 'found.'),
deprecated_group='DEFAULT'), deprecated_group='DEFAULT'),
# NOTE(stevemar): Remove this option in the M cycle, refer to bug 1428332
cfg.MultiStrOpt('policy_dirs', cfg.MultiStrOpt('policy_dirs',
default=['policy.d'], default=['policy.d'],
help=_('Directories where policy configuration files are ' help=_('Directories where policy configuration files are '
@ -43,7 +44,8 @@ _options = [
'policy_file must exist for these directories to ' 'policy_file must exist for these directories to '
'be searched. Missing or empty directories are ' 'be searched. Missing or empty directories are '
'ignored.'), 'ignored.'),
deprecated_group='DEFAULT'), deprecated_group='DEFAULT',
deprecated_for_removal=True),
] ]