openstack/ironic
Code Issues Proposed changes

Fix "tox -egenconfig" by avoiding the MODULEPATH env variable

Browse Source 
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
This commit is contained in:
Lucas Alvares Gomes
2015-08-20 10:50:00 +01:00
parent cb12fc29d9
commit 2e16a3cd7e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/config/generate_sample.sh
View File

@@ -121,10 +121,10 @@ export EVENTLET_NO_GREENDNS=yes
OS_VARS=$(set | sed -n '/^OS_/s/=[^=]*$//gp' | xargs) OS_VARS=$(set | sed -n '/^OS_/s/=[^=]*$//gp' | xargs)
[ "$OS_VARS" ] && eval "unset \$OS_VARS" [ "$OS_VARS" ] && eval "unset \$OS_VARS"
DEFAULT_MODULEPATH=ironic.common.config_generator.generator DEFAULT_CONFIG_GENERATOR=ironic.common.config_generator.generator
MODULEPATH=${MODULEPATH:-$DEFAULT_MODULEPATH} CONFIG_GENERATOR=${CONFIG_GENERATOR:-$DEFAULT_CONFIG_GENERATOR}
OUTPUTFILE=$OUTPUTDIR/$PACKAGENAME.conf.sample OUTPUTFILE=$OUTPUTDIR/$PACKAGENAME.conf.sample
python -m $MODULEPATH $MODULES $LIBRARIES $FILES > $OUTPUTFILE python -m $CONFIG_GENERATOR $MODULES $LIBRARIES $FILES > $OUTPUTFILE
if [ $? != 0 ] if [ $? != 0 ]
then then
echo "Can not generate $OUTPUTFILE" echo "Can not generate $OUTPUTFILE"