Fix doc generation warnings

Fix the following warnings.

- A warning in config sample generation
- Warnings about nova-status.rst

Change-Id: Ifcc3b4a89eeea9d0dd62e2a8b560c5e6a9ff3d1a
Closes-Bug: #1659485
This commit is contained in:
Takashi NATSUME 2017-01-26 14:25:22 +09:00
parent c1be39eaca
commit 1585ca189e
3 changed files with 19 additions and 12 deletions

View File

@ -61,16 +61,25 @@ Upgrade
service catalog.
**Return Codes**
::
0) All upgrade readiness checks passed successfully and there is nothing
to do.
1) At least one check encountered an issue and requires further
investigation. This is considered a warning but the upgrade may be OK.
2) There was an upgrade status check failure that needs to be
investigated. This should be considered something that stops an
upgrade.
255) An unexpected error occurred.
.. list-table::
:widths: 20 80
:header-rows: 1
* - Return code
- Description
* - 0
- All upgrade readiness checks passed successfully and there is nothing
to do.
* - 1
- At least one check encountered an issue and requires further
investigation. This is considered a warning but the upgrade may be OK.
* - 2
- There was an upgrade status check failure that needs to be
investigated. This should be considered something that stops an
upgrade.
* - 255
- An unexpected error occurred.
**History of Checks**

View File

@ -2,8 +2,6 @@
output_file = etc/nova/nova.conf.sample
wrap_width = 80
namespace = nova.conf
namespace = nova.api
namespace = nova.cells
namespace = oslo.log
namespace = oslo.messaging
namespace = oslo.policy

View File

@ -29,7 +29,7 @@ oslo.config.opts =
nova.conf = nova.conf.opts:list_opts
oslo.config.opts.defaults =
nova.api = nova.common.config:set_middleware_defaults
nova.conf = nova.common.config:set_middleware_defaults
oslo.policy.enforcer =
nova = nova.policy:get_enforcer