From f06e9d80e8c3501b2263f0211d5d8219514062b2 Mon Sep 17 00:00:00 2001 From: Jay Dobies Date: Mon, 11 May 2015 15:13:49 -0400 Subject: [PATCH] Avoid MODULEPATH environment var in config generator 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 --- tools/config/generate_sample.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/config/generate_sample.sh b/tools/config/generate_sample.sh index b3341a5a..4b6cd9b8 100755 --- a/tools/config/generate_sample.sh +++ b/tools/config/generate_sample.sh @@ -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)