Browse Source

Merge "Rearrange conf and policy configuration file"

tags/8.1.0
Zuul 10 months ago
parent
commit
106716abd1

+ 2
- 2
doc/source/conf.py View File

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

+ 1
- 1
doc/source/configuration/ironic-inspector.rst View File

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

+ 1
- 1
doc/source/configuration/policy.rst View File

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

config-generator.conf → tools/config-generator.conf View File


policy-generator.conf → tools/policy-generator.conf View File


+ 2
- 2
tox.ini View File

@@ -54,13 +54,13 @@ commands =
54 54
 [testenv:genconfig]
55 55
 basepython = python3
56 56
 envdir = {toxworkdir}/venv
57
-commands = oslo-config-generator --config-file config-generator.conf
57
+commands = oslo-config-generator --config-file {toxinidir}/tools/config-generator.conf
58 58
 
59 59
 [testenv:genpolicy]
60 60
 basepython = python3
61 61
 sitepackages = False
62 62
 envdir = {toxworkdir}/venv
63
-commands = oslopolicy-sample-generator --config-file {toxinidir}/policy-generator.conf
63
+commands = oslopolicy-sample-generator --config-file {toxinidir}/tools/policy-generator.conf
64 64
 
65 65
 [testenv:genstates]
66 66
 basepython = python3

+ 1
- 0
zuul.d/legacy-ironic-inspector-jobs.yaml View File

@@ -20,6 +20,7 @@
20 20
       - ^ironic_inspector/locale/.*$
21 21
       - ^releasenotes/.*$
22 22
       - ^setup.cfg$
23
+      - ^tools/.*$
23 24
       - ^tox.ini$
24 25
 
25 26
 - job:

Loading…
Cancel
Save