Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Change flat network name for nosdn fdio scenario
[apex-tripleo-heat-templates.git]
/
puppet
/
deploy-artifacts.sh
diff --git
a/puppet/deploy-artifacts.sh
b/puppet/deploy-artifacts.sh
index
8bcbbf4
..
e4d20b4
100644
(file)
--- a/
puppet/deploy-artifacts.sh
+++ b/
puppet/deploy-artifacts.sh
@@
-8,18
+8,22
@@
trap cleanup EXIT
if [ -n "$artifact_urls" ]; then
for URL in $(echo $artifact_urls | sed -e "s| |\n|g" | sort -u); do
if [ -n "$artifact_urls" ]; then
for URL in $(echo $artifact_urls | sed -e "s| |\n|g" | sort -u); do
- curl --globoff -o $TMP_DATA/file_data "$
artifact_urls
"
+ curl --globoff -o $TMP_DATA/file_data "$
URL
"
if file -b $TMP_DATA/file_data | grep RPM &>/dev/null; then
if file -b $TMP_DATA/file_data | grep RPM &>/dev/null; then
- yum install -y $TMP_DATA/file_data
+ mv $TMP_DATA/file_data $TMP_DATA/file_data.rpm
+ yum install -y $TMP_DATA/file_data.rpm
+ rm $TMP_DATA/file_data.rpm
elif file -b $TMP_DATA/file_data | grep 'gzip compressed data' &>/dev/null; then
pushd /
tar xvzf $TMP_DATA/file_data
popd
else
elif file -b $TMP_DATA/file_data | grep 'gzip compressed data' &>/dev/null; then
pushd /
tar xvzf $TMP_DATA/file_data
popd
else
- echo "ERROR: Unsupported file format
.
"
+ echo "ERROR: Unsupported file format
: $URL
"
exit 1
fi
exit 1
fi
- rm $TMP_DATA/file_data
+ if [ -f $TMP_DATA/file_data ]; then
+ rm $TMP_DATA/file_data
+ fi
done
else
echo "No artifact_urls was set. Skipping..."
done
else
echo "No artifact_urls was set. Skipping..."