Merge "Rearrange conf and policy configuration file"

This commit is contained in:
Zuul 2018-10-22 18:54:37 +00:00 committed by Gerrit Code Review
commit 106716abd1
7 changed files with 7 additions and 6 deletions

View File

@ -42,10 +42,10 @@ master_doc = 'index'
project = u'Ironic Inspector'
copyright = u'OpenStack Foundation'
config_generator_config_file = '../../config-generator.conf'
config_generator_config_file = '../../tools/config-generator.conf'
sample_config_basename = '_static/ironic-inspector'
policy_generator_config_file = '../../policy-generator.conf'
policy_generator_config_file = '../../tools/policy-generator.conf'
sample_policy_basename = '_static/ironic-inspector'
# The version info for the project you're documenting, acts as replacement for

View File

@ -4,4 +4,4 @@ ironic-inspector.conf
---------------------
.. show-options::
:config-file: config-generator.conf
:config-file: tools/config-generator.conf

View File

@ -6,4 +6,4 @@ The following is an overview of all available policies in **ironic inspector**.
For a sample configuration file, refer to :doc:`sample-policy`.
.. show-policy::
:config-file: policy-generator.conf
:config-file: tools/policy-generator.conf

View File

@ -54,13 +54,13 @@ commands =
[testenv:genconfig]
basepython = python3
envdir = {toxworkdir}/venv
commands = oslo-config-generator --config-file config-generator.conf
commands = oslo-config-generator --config-file {toxinidir}/tools/config-generator.conf
[testenv:genpolicy]
basepython = python3
sitepackages = False
envdir = {toxworkdir}/venv
commands = oslopolicy-sample-generator --config-file {toxinidir}/policy-generator.conf
commands = oslopolicy-sample-generator --config-file {toxinidir}/tools/policy-generator.conf
[testenv:genstates]
basepython = python3

View File

@ -20,6 +20,7 @@
- ^ironic_inspector/locale/.*$
- ^releasenotes/.*$
- ^setup.cfg$
- ^tools/.*$
- ^tox.ini$
- job: