diff options
| author | Mehdi Abaakouk <mehdi.abaakouk@enovance.com> | 2013-08-13 13:39:54 +0200 |
|---|---|---|
| committer | Mehdi Abaakouk <sileht@sileht.net> | 2013-08-14 12:33:02 +0200 |
| commit | 4c02e0a1181c669bcf19571edbe0c6d58cbc5a4f (patch) | |
| tree | e3b96e6790842df82aab218e10f0508e316fb9c2 | |
| parent | 2548344ec644de763a18d7f582094d2e26861887 (diff) | |
| download | oslo-4c02e0a1181c669bcf19571edbe0c6d58cbc5a4f.tar.gz oslo-4c02e0a1181c669bcf19571edbe0c6d58cbc5a4f.tar.xz oslo-4c02e0a1181c669bcf19571edbe0c6d58cbc5a4f.zip | |
Unset OS_xx variable before generate configuration
When generate_sample.sh generate the configuration of the
keystone middleware part, it use OS_XXXXX environment
variable if this one is set instead of the default one.
This change unset this variables, before generate_sample.sh
inspect the code to always have the default value.
Change-Id: I4f41eece3d93633fcc07274f533adfa1887325fc
| -rwxr-xr-x | tools/config/generate_sample.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/config/generate_sample.sh b/tools/config/generate_sample.sh index 26f02dd..f5e5a67 100755 --- a/tools/config/generate_sample.sh +++ b/tools/config/generate_sample.sh @@ -64,6 +64,9 @@ FILES=$(find $BASEDIR/$PACKAGENAME -type f -name "*.py" ! -path "*/tests/*" \ export EVENTLET_NO_GREENDNS=yes +OS_VARS=$(set | sed -n '/^OS_/s/=[^=]*$//gp' | xargs) +[ "$OS_VARS" ] && eval "unset \$OS_VARS" + MODULEPATH=openstack.common.config.generator OUTPUTFILE=$OUTPUTDIR/$PACKAGENAME.conf.sample python -m $MODULEPATH $FILES > $OUTPUTFILE |