summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-22 18:54:37 +0000
committerGerrit Code Review <review@openstack.org>2018-10-22 18:54:37 +0000
commit106716abd1f973b16d34d244b812e18b597ab750 (patch)
tree713f6fe127f7999b39908bb7178d57d517fb5c61
parent10109622c114755dcb5f7032b478cd1ec3d9b886 (diff)
parent8ab225e47a0690b68282b0b74cd98561d06b6ddc (diff)
Merge "Rearrange conf and policy configuration file"
-rw-r--r--doc/source/conf.py4
-rw-r--r--doc/source/configuration/ironic-inspector.rst2
-rw-r--r--doc/source/configuration/policy.rst2
-rw-r--r--tools/config-generator.conf (renamed from config-generator.conf)0
-rw-r--r--tools/policy-generator.conf (renamed from policy-generator.conf)0
-rw-r--r--tox.ini4
-rw-r--r--zuul.d/legacy-ironic-inspector-jobs.yaml1
7 files changed, 7 insertions, 6 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 7f342a2..f085318 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -42,10 +42,10 @@ master_doc = 'index'
42project = u'Ironic Inspector' 42project = u'Ironic Inspector'
43copyright = u'OpenStack Foundation' 43copyright = u'OpenStack Foundation'
44 44
45config_generator_config_file = '../../config-generator.conf' 45config_generator_config_file = '../../tools/config-generator.conf'
46sample_config_basename = '_static/ironic-inspector' 46sample_config_basename = '_static/ironic-inspector'
47 47
48policy_generator_config_file = '../../policy-generator.conf' 48policy_generator_config_file = '../../tools/policy-generator.conf'
49sample_policy_basename = '_static/ironic-inspector' 49sample_policy_basename = '_static/ironic-inspector'
50 50
51# The version info for the project you're documenting, acts as replacement for 51# 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 3fc55fa..701c364 100644
--- a/doc/source/configuration/ironic-inspector.rst
+++ b/doc/source/configuration/ironic-inspector.rst
@@ -4,4 +4,4 @@ ironic-inspector.conf
4--------------------- 4---------------------
5 5
6.. show-options:: 6.. show-options::
7 :config-file: config-generator.conf 7 :config-file: tools/config-generator.conf
diff --git a/doc/source/configuration/policy.rst b/doc/source/configuration/policy.rst
index f14ac5a..fbd3a81 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**.
6For a sample configuration file, refer to :doc:`sample-policy`. 6For a sample configuration file, refer to :doc:`sample-policy`.
7 7
8.. show-policy:: 8.. show-policy::
9 :config-file: policy-generator.conf 9 :config-file: tools/policy-generator.conf
diff --git a/config-generator.conf b/tools/config-generator.conf
index fae4268..fae4268 100644
--- a/config-generator.conf
+++ b/tools/config-generator.conf
diff --git a/policy-generator.conf b/tools/policy-generator.conf
index e5d39d9..e5d39d9 100644
--- a/policy-generator.conf
+++ b/tools/policy-generator.conf
diff --git a/tox.ini b/tox.ini
index 6e64883..04a7808 100644
--- a/tox.ini
+++ b/tox.ini
@@ -54,13 +54,13 @@ commands =
54[testenv:genconfig] 54[testenv:genconfig]
55basepython = python3 55basepython = python3
56envdir = {toxworkdir}/venv 56envdir = {toxworkdir}/venv
57commands = oslo-config-generator --config-file config-generator.conf 57commands = oslo-config-generator --config-file {toxinidir}/tools/config-generator.conf
58 58
59[testenv:genpolicy] 59[testenv:genpolicy]
60basepython = python3 60basepython = python3
61sitepackages = False 61sitepackages = False
62envdir = {toxworkdir}/venv 62envdir = {toxworkdir}/venv
63commands = oslopolicy-sample-generator --config-file {toxinidir}/policy-generator.conf 63commands = oslopolicy-sample-generator --config-file {toxinidir}/tools/policy-generator.conf
64 64
65[testenv:genstates] 65[testenv:genstates]
66basepython = python3 66basepython = python3
diff --git a/zuul.d/legacy-ironic-inspector-jobs.yaml b/zuul.d/legacy-ironic-inspector-jobs.yaml
index 7c2da11..4196a16 100644
--- a/zuul.d/legacy-ironic-inspector-jobs.yaml
+++ b/zuul.d/legacy-ironic-inspector-jobs.yaml
@@ -20,6 +20,7 @@
20 - ^ironic_inspector/locale/.*$ 20 - ^ironic_inspector/locale/.*$
21 - ^releasenotes/.*$ 21 - ^releasenotes/.*$
22 - ^setup.cfg$ 22 - ^setup.cfg$
23 - ^tools/.*$
23 - ^tox.ini$ 24 - ^tox.ini$
24 25
25- job: 26- job: