commit 0b46e3d58543010d7d729d8c220202dc51e395e6
author Jenkins <jenkins@review.openstack.org> Thu Jun 26 22:09:57 2014 +0000
committer Gerrit Code Review <review@openstack.org> Thu Jun 26 22:09:58 2014 +0000
tree f5b9df0bc10cb4a66296c48579f5c64a71cc4946
parent cb31b9b2fffed2e455797c64a8a0969d231a0e32
parent afeb91a5dacdcbb2116a66b187b997d468612022

Merge "Use config generator rc instead of wrapper script"

tools/config/oslo.config.generator.rc

diff --git a/tools/config/oslo.config.generator.rc b/tools/config/oslo.config.generator.rc
new file mode 100644
index 0000000..303e156
--- /dev/null
+++ b/tools/config/oslo.config.generator.rc
@@ -0,0 +1 @@
+MODULEPATH=tempest.common.generate_sample_tempest

tools/generate_sample.sh

diff --git a/tools/generate_sample.sh b/tools/generate_sample.sh
deleted file mode 100755
index 9b312c9..0000000
--- a/tools/generate_sample.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-MODULEPATH=tempest.common.generate_sample_tempest tools/config/generate_sample.sh $@

tox.ini

diff --git a/tox.ini b/tox.ini
index c1acde9..73546ec 100644
--- a/tox.ini
+++ b/tox.ini
@@ -85,7 +85,6 @@
        -r{toxinidir}/test-requirements.txt
 
 [testenv:pep8]
-setenv = MODULEPATH=tempest.common.generate_sample_tempest
 commands =
    flake8 {posargs}
    {toxinidir}/tools/config/check_uptodate.sh