openstack/heat
Code Issues Proposed changes

Merge "Move input file for oslo-config-generator"

Browse Source
This commit is contained in:
Zuul
2024-10-01 15:26:12 +00:00
committed by Gerrit Code Review
parent e25a4c15c2 80845924d3
commit 7e3b981156
5 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.yaml
View File

@@ -100,6 +100,7 @@
- ^.*\.rst$ - ^.*\.rst$
- ^api-ref/.*$ - ^api-ref/.*$
- ^doc/.*$ - ^doc/.*$
- ^etc/heat/heat-.*-generator.conf$
- ^heat/locale/.*$ - ^heat/locale/.*$
- ^heat/tests/.*$ - ^heat/tests/.*$
- ^releasenotes/.*$ - ^releasenotes/.*$
@@ -177,6 +178,7 @@
- ^.*\.rst$ - ^.*\.rst$
- ^api-ref/.*$ - ^api-ref/.*$
- ^doc/.*$ - ^doc/.*$
- ^etc/heat/heat-.*-generator.conf$
- ^heat/locale/.*$ - ^heat/locale/.*$
- ^heat/tests/.*$ - ^heat/tests/.*$
- ^releasenotes/.*$ - ^releasenotes/.*$

2
doc/source/conf.py
View File

@@ -92,7 +92,7 @@ policy_generator_config_file = '../../etc/heat/heat-policy-generator.conf'
sample_policy_basename = '_static/heat' sample_policy_basename = '_static/heat'
# oslo_config.sphinxconfiggen options # oslo_config.sphinxconfiggen options
config_generator_config_file = '../../config-generator.conf' config_generator_config_file = '../../etc/heat/heat-config-generator.conf'
sample_config_basename = '_static/heat' sample_config_basename = '_static/heat'
# openstackdocstheme options # openstackdocstheme options

2
doc/source/configuration/config-options.rst
View File

@@ -6,4 +6,4 @@ The following options can be set in the ``/etc/heat/heat.conf`` config file.
A :doc:`sample configuration file <sample_config>` is also available. A :doc:`sample configuration file <sample_config>` is also available.
.. show-options:: .. show-options::
:config-file: config-generator.conf :config-file: etc/heat/heat-config-generator.conf

0
config-generator.conf → etc/heat/heat-config-generator.conf
View File

2
tox.ini
View File

@@ -85,7 +85,7 @@ commands =
[testenv:genconfig] [testenv:genconfig]
commands = commands =
oslo-config-generator --config-file=config-generator.conf oslo-config-generator --config-file=etc/heat/heat-config-generator.conf
[testenv:genpolicy] [testenv:genpolicy]
commands = commands =