Merge "Fix genconfig tox env"

3 files changed, 4 insertions, 8 deletions

diff --git a/heat_integrationtests/README.rst b/heat_integrationtests/README.rst
index ec4635a56..bfb0e7237 100644
--- a/heat_integrationtests/README.rst
+++ b/heat_integrationtests/README.rst
@@ -20,6 +20,7 @@ To run the tests against DevStack, do the following::
 If the Heat Tempest Plugin is also installed, the tests from that will be run
 as well.
 
-If custom configuration is required, add it in the file
-``heat_integrationtests/heat_integrationtests.conf``. A sample configuration is
-available in ``heat_integrationtests/heat_integrationtests.conf.sample``
+These tests require both tempest and heat tempest plugin installed.
+If custom configuration is required, it should be configured in the
+heat tempest plugin configuration of the tempest config
+(see heat tempest plugin and tempest docs for more info).
diff --git a/heat_integrationtests/config-generator.conf b/heat_integrationtests/config-generator.conf
deleted file mode 100644
index 4c92c4851..000000000
--- a/heat_integrationtests/config-generator.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[DEFAULT]
-output_file = heat_integrationtests/heat_integrationtests.conf.sample
-wrap_width = 79
-namespace = heat_integrationtests.common.config
diff --git a/tox.ini b/tox.ini
index 736297877..75d150886 100644
--- a/tox.ini
+++ b/tox.ini
@@ -81,7 +81,6 @@ commands =
 [testenv:genconfig]
 commands =
     oslo-config-generator --config-file=config-generator.conf
-    oslo-config-generator --config-file=heat_integrationtests/config-generator.conf
 
 [testenv:genpolicy]
 commands =