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

.zuul.yaml

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

doc/source/conf.py

@@ -92,7 +92,7 @@ policy_generator_config_file = '../../etc/heat/heat-policy-generator.conf'
 sample_policy_basename = '_static/heat'
 
 # 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'
 
 # openstackdocstheme options

doc/source/configuration/config-options.rst

@@ -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.
 
 .. show-options::
-   :config-file: config-generator.conf
+   :config-file: etc/heat/heat-config-generator.conf

tox.ini

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