diff options
| author | Lucas Alvares Gomes <lucasagomes@gmail.com> | 2015-08-20 10:50:00 +0100 |
|---|---|---|
| committer | Lucas Alvares Gomes <lucasagomes@gmail.com> | 2015-08-20 10:50:00 +0100 |
| commit | 2e16a3cd7e7804d435cd5088dc2d84deaddf2560 (patch) | |
| tree | 910fcecc70095e4b3713a4de553f30b5dedd0756 /tools | |
| parent | cb12fc29d9196cc010fdfa752ea85a5f21180f8c (diff) | |
| download | ironic-2e16a3cd7e7804d435cd5088dc2d84deaddf2560.tar.gz | |
Fix "tox -egenconfig" by avoiding the MODULEPATH env variable
MODULEPATH is apparently a well known variable from environment-modules
package and was causing the sample configuration generation to fail.
Change-Id: Ie9f1896c9480aa371c99a316511b172e92f52824
Closes-Bug: #1437904
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/config/generate_sample.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/config/generate_sample.sh b/tools/config/generate_sample.sh index 5fc53dc77..5363fbf47 100755 --- a/tools/config/generate_sample.sh +++ b/tools/config/generate_sample.sh @@ -121,10 +121,10 @@ export EVENTLET_NO_GREENDNS=yes OS_VARS=$(set | sed -n '/^OS_/s/=[^=]*$//gp' | xargs) [ "$OS_VARS" ] && eval "unset \$OS_VARS" -DEFAULT_MODULEPATH=ironic.common.config_generator.generator -MODULEPATH=${MODULEPATH:-$DEFAULT_MODULEPATH} +DEFAULT_CONFIG_GENERATOR=ironic.common.config_generator.generator +CONFIG_GENERATOR=${CONFIG_GENERATOR:-$DEFAULT_CONFIG_GENERATOR} OUTPUTFILE=$OUTPUTDIR/$PACKAGENAME.conf.sample -python -m $MODULEPATH $MODULES $LIBRARIES $FILES > $OUTPUTFILE +python -m $CONFIG_GENERATOR $MODULES $LIBRARIES $FILES > $OUTPUTFILE if [ $? != 0 ] then echo "Can not generate $OUTPUTFILE" |