Merge "conf: fix formatting in base"

This commit is contained in:
Jenkins 2017-01-04 14:40:50 +00:00 committed by Gerrit Code Review
commit e929af4cbe
1 changed files with 11 additions and 10 deletions

View File

@ -33,9 +33,10 @@ offset to given period by appending @ character followed by a number defining
offset. offset.
Possible values: Possible values:
* period, example: ``hour``, ``day``, ``month` or ``year``
* period with offset, example: ``month@15`` * period, example: ``hour``, ``day``, ``month` or ``year``
will result in monthly audits starting on 15th day of month. * period with offset, example: ``month@15`` will result in monthly audits
starting on 15th day of month.
'''), '''),
cfg.BoolOpt( cfg.BoolOpt(
'use_rootwrap_daemon', 'use_rootwrap_daemon',
@ -67,8 +68,8 @@ Determine if monkey patching should be applied.
Related options: Related options:
* ``monkey_patch_modules``: This must have values set for this option to have * ``monkey_patch_modules``: This must have values set for this option to
any effect have any effect
"""), """),
cfg.ListOpt( cfg.ListOpt(
'monkey_patch_modules', 'monkey_patch_modules',
@ -81,14 +82,14 @@ modules.
Possible values: Possible values:
* nova.compute.api:nova.notifications.notify_decorator * nova.compute.api:nova.notifications.notify_decorator
* nova.api.ec2.cloud:nova.notifications.notify_decorator * nova.api.ec2.cloud:nova.notifications.notify_decorator
* [...] * [...]
Related options: Related options:
* ``monkey_patch``: This must be set to ``True`` for this option to * ``monkey_patch``: This must be set to ``True`` for this option to
have any effect have any effect
"""), """),
] ]