Browse Source

Rearrange conf and policy configuration file

Minor project file structure adjustment, to move config-generator.conf
and policy-generator.conf into tools/ subdirectory.

Also exclude tools/ from dsvm jobs.

Change-Id: I3242401511b88bd9b677d9875481808783f890b8
changes/84/609584/2
Kaifeng Wang 4 years ago
parent
commit
8ab225e47a
  1. 4
      doc/source/conf.py
  2. 2
      doc/source/configuration/ironic-inspector.rst
  3. 2
      doc/source/configuration/policy.rst
  4. 0
      tools/config-generator.conf
  5. 0
      tools/policy-generator.conf
  6. 4
      tox.ini
  7. 1
      zuul.d/legacy-ironic-inspector-jobs.yaml

4
doc/source/conf.py

@ -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

2
doc/source/configuration/ironic-inspector.rst

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

2
doc/source/configuration/policy.rst

@ -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

0
config-generator.conf → tools/config-generator.conf

0
policy-generator.conf → tools/policy-generator.conf

4
tox.ini

@ -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

1
zuul.d/legacy-ironic-inspector-jobs.yaml

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

Loading…
Cancel
Save