diff options
| author | Ben Nemec <bnemec@redhat.com> | 2018-05-15 19:18:18 +0000 |
|---|---|---|
| committer | Ben Nemec <bnemec@redhat.com> | 2018-05-15 19:18:18 +0000 |
| commit | 48949f5e20aff2f5caa3cad48666b13b8be91f29 (patch) | |
| tree | 79a63fdabca41a2355a310d87a41945658f67b59 /oslo_policy/generator.py | |
| parent | 62645f688c64fa8cb4297071676635223db2cab9 (diff) | |
| download | oslo-policy-48949f5e20aff2f5caa3cad48666b13b8be91f29.tar.gz | |
Include both new and deprecated rules in generated sample
Previously, if a deprecated_rule was set on a rule, only the
deprecated rule was written to the sample policy file. This is
wrong since we want to be setting the new, undeprecated rule going
forward.
Change-Id: I181aeecda686d1d499616254c93002f51a5462c3
Diffstat (limited to 'oslo_policy/generator.py')
| -rw-r--r-- | oslo_policy/generator.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/oslo_policy/generator.py b/oslo_policy/generator.py index fa5f4ee..485aba6 100644 --- a/oslo_policy/generator.py +++ b/oslo_policy/generator.py @@ -157,8 +157,9 @@ def _format_rule_default_yaml(default, include_help=True): 'check_str': default.check_str} text = ( - '%(deprecated_text)s\n"%(old_name)s": "rule:%(name)s"\n' - ) % {'deprecated_text': _format_help_text(deprecated_text), + '%(text)s%(deprecated_text)s\n"%(old_name)s": "rule:%(name)s"\n' + ) % {'text': text, + 'deprecated_text': _format_help_text(deprecated_text), 'old_name': default.deprecated_rule.name, 'name': default.name} |