diff options
| author | Mehdi Abaakouk <mehdi.abaakouk@enovance.com> | 2013-07-15 17:58:48 +0200 |
|---|---|---|
| committer | Mehdi Abaakouk <mehdi.abaakouk@enovance.com> | 2013-07-15 18:06:28 +0200 |
| commit | 4931203a089f3cf39a19370285e69b3430b45ad5 (patch) | |
| tree | 3c02768e755fbc996dc2d0a5f672f27d4e7dc71a /tools | |
| parent | 048c59c9300d5b4e45822e53df2062acd6a44789 (diff) | |
| download | ceilometer-4931203a089f3cf39a19370285e69b3430b45ad5.tar.gz | |
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 vairables, before generate_sample.sh
inspect the code to always have the default value.
Change-Id: I365387e99dff0e1c64cd1c4198088200bf726cd7
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/conf/generate_sample.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/conf/generate_sample.sh b/tools/conf/generate_sample.sh index d42b40f8..e045ad9e 100755 --- a/tools/conf/generate_sample.sh +++ b/tools/conf/generate_sample.sh @@ -17,6 +17,10 @@ # License for the specific language governing permissions and limitations # under the License. + +OS_VARS=$(set | sed -n '/^OS_/s/=[^=*]*$//gp' | xargs) +[ "$OS_VARS" ] && eval "unset \$OS_VARS" + FILES=$(find ceilometer -type f -name "*.py" ! -path "ceilometer/tests/*" -exec \ grep -l "Opt(" {} \; | sort -u) |