From 8ab225e47a0690b68282b0b74cd98561d06b6ddc Mon Sep 17 00:00:00 2001 From: Kaifeng Wang Date: Thu, 11 Oct 2018 12:07:09 +0800 Subject: [PATCH] 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 --- doc/source/conf.py | 4 ++-- doc/source/configuration/ironic-inspector.rst | 2 +- doc/source/configuration/policy.rst | 2 +- config-generator.conf => tools/config-generator.conf | 0 policy-generator.conf => tools/policy-generator.conf | 0 tox.ini | 4 ++-- zuul.d/legacy-ironic-inspector-jobs.yaml | 1 + 7 files changed, 7 insertions(+), 6 deletions(-) rename config-generator.conf => tools/config-generator.conf (100%) rename policy-generator.conf => tools/policy-generator.conf (100%) diff --git a/doc/source/conf.py b/doc/source/conf.py index 7f342a2a3..f08531854 100644 --- a/doc/source/conf.py +++ b/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 diff --git a/doc/source/configuration/ironic-inspector.rst b/doc/source/configuration/ironic-inspector.rst index 3fc55fa7c..701c36493 100644 --- a/doc/source/configuration/ironic-inspector.rst +++ b/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 diff --git a/doc/source/configuration/policy.rst b/doc/source/configuration/policy.rst index f14ac5a8c..fbd3a810e 100644 --- a/doc/source/configuration/policy.rst +++ b/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 diff --git a/config-generator.conf b/tools/config-generator.conf similarity index 100% rename from config-generator.conf rename to tools/config-generator.conf diff --git a/policy-generator.conf b/tools/policy-generator.conf similarity index 100% rename from policy-generator.conf rename to tools/policy-generator.conf diff --git a/tox.ini b/tox.ini index 6e648831f..04a78087a 100644 --- a/tox.ini +++ b/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 diff --git a/zuul.d/legacy-ironic-inspector-jobs.yaml b/zuul.d/legacy-ironic-inspector-jobs.yaml index 7c2da11b0..4196a162b 100644 --- a/zuul.d/legacy-ironic-inspector-jobs.yaml +++ b/zuul.d/legacy-ironic-inspector-jobs.yaml @@ -20,6 +20,7 @@ - ^ironic_inspector/locale/.*$ - ^releasenotes/.*$ - ^setup.cfg$ + - ^tools/.*$ - ^tox.ini$ - job: