summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--oslo_policy/opts.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/oslo_policy/opts.py b/oslo_policy/opts.py
index 5eb93d7..f4e641a 100644
--- a/oslo_policy/opts.py
+++ b/oslo_policy/opts.py
@@ -44,7 +44,11 @@ _options = [
'defaults, it will be disallowed. It is encouraged to '
'enable this flag along with the ``enforce_scope`` '
'flag so that you can get the benefits of new defaults '
- 'and ``scope_type`` together')),
+ 'and ``scope_type`` together. If ``False``, the '
+ 'deprecated policy check string is logically OR\'d '
+ 'with the new policy check string, allowing for a '
+ 'graceful upgrade experience between releases with '
+ 'new policies, which is the default behavior.')),
cfg.StrOpt('policy_file',
default='policy.json',
help=_('The relative or absolute path of a file that maps '