From e7b51eb27f4eec4d7ae4b89640550dff64641e6a Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Sun, 29 Mar 2015 19:49:01 -0400 Subject: [PATCH] Avoid MODULEPATH environment var in config generator MODULEPATH is apparently a well known variable from environment-modules package. So let's just use another one as we don't care about the specific var name itself. Closes-Bug: #1437904 Change-Id: Id79bbdaad498c771dc4c032256bd8160b5663ef9 --- 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 94d6f3ec950c..1de1b7ebcd11 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=nova.openstack.common.config.generator -MODULEPATH=${MODULEPATH:-$DEFAULT_MODULEPATH} +DEFAULT_CONFIG_GENERATOR=nova.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)