x/tuskar
Code Issues Proposed changes

Avoid MODULEPATH environment var in config generator

Browse Source 
generate_sample.sh fails if MODULEPATH is already set. This fix was
adapted from a change in nova: https://review.openstack.org/#/c/168745/

Change-Id: I2b0b52b5d71157a42028d95d84e36eeb0fe3016d
This commit is contained in:
Jay Dobies 2015-05-11 15:13:49 -04:00
parent da38971472
commit f06e9d80e8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/config/generate_sample.sh
View File

@ -107,10 +107,10 @@ export EVENTLET_NO_GREENDNS=yes
OS_VARS=$(set | sed -n '/^OS_/s/=[^=]*$//gp' | xargs)
[ "$OS_VARS" ] && eval "unset \$OS_VARS"
DEFAULT_MODULEPATH=tuskar.openstack.common.config.generator
MODULEPATH=${MODULEPATH:-$DEFAULT_MODULEPATH}
DEFAULT_CONFIG_GENERATOR=tuskar.openstack.common.config.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
# Hook to allow projects to append custom config file snippets
CONCAT_FILES=$(ls $BASEDIR/tools/config/*.conf.sample 2>/dev/null)