Merge "doc: Integrate oslo_policy.sphinxpolicygen"

This commit is contained in:
Jenkins 2016-10-21 02:04:44 +00:00 committed by Gerrit Code Review
commit efc8fbb32a
3 changed files with 13 additions and 1 deletions

1
.gitignore vendored

@ -45,6 +45,7 @@ nova/tests/cover/*
nova/vcsversion.py
tools/conf/nova.conf*
doc/source/_static/nova.conf.sample
doc/source/_static/nova.policy.yaml.sample
# Files created by releasenotes build
releasenotes/build

@ -34,8 +34,9 @@ extensions = ['sphinx.ext.autodoc',
'sphinx.ext.coverage',
'sphinx.ext.graphviz',
'oslosphinx',
"ext.support_matrix",
'ext.support_matrix',
'oslo_config.sphinxconfiggen',
'oslo_policy.sphinxpolicygen',
'ext.versioned_notifications',
'ext.feature_matrix',
]
@ -43,6 +44,9 @@ extensions = ['sphinx.ext.autodoc',
config_generator_config_file = '../../etc/nova/nova-config-generator.conf'
sample_config_basename = '_static/nova'
policy_generator_config_file = '../../etc/nova/nova-policy-generator.conf'
sample_policy_basename = '_static/nova'
todo_include_todos = True
# The suffix of source filenames.

@ -190,6 +190,13 @@ Sample Configuration File
sample_config
Sample Policy file
------------------
.. toctree::
:maxdepth: 1
sample_policy
Man Pages
----------