summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-07-13 14:46:21 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-07-13 14:46:21 +0000
commitb36000ac8c1a2d26ad82b6bc81fb5e4a87440d24 (patch)
tree62a05cb7a6d6a3f0edfe92f944b3f2e79ab63a88
parent326df028a9a49c2da1dfe36e1d2ae3f4a7f51838 (diff)
parent679c5f5ca0e905ccb9b8c67603f068bbff9a506c (diff)
Merge "Prevent printing remote md5 sum"
-rw-r--r--build/cache.sh2
-rwxr-xr-xbuild/overcloud-full.sh1
2 files changed, 2 insertions, 1 deletions
diff --git a/build/cache.sh b/build/cache.sh
index 123748a2..4d41a7a2 100644
--- a/build/cache.sh
+++ b/build/cache.sh
@@ -60,7 +60,7 @@ function populate_cache {
else
my_md5=$(grep ${filename} $CACHE_DIR/.cache | awk {'print $1'})
if [ "$remote_md5" != "$my_md5" ]; then
- echo "MD5 mismatch: Remote MD5 is ${remote_md5}, Cache file MD5 is ${my_md5}"
+ echo "MD5 mismatch, cache file MD5 is ${my_md5}"
echo "Downloading $filename"
curl_file $1 $filename
else
diff --git a/build/overcloud-full.sh b/build/overcloud-full.sh
index 73709a28..01f40269 100755
--- a/build/overcloud-full.sh
+++ b/build/overcloud-full.sh
@@ -83,6 +83,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \
--upload puppet-congress.tar.gz:/etc/puppet/modules/ \
--run-command "cd /etc/puppet/modules/ && tar xzf puppet-congress.tar.gz" \
--run-command "cd /usr/lib/python2.7/site-packages/congress/datasources && curl -O $doctor_driver" \
+ --run-command "sed -i \"s/'--detailed-exitcodes',/'--detailed-exitcodes','-l','syslog','-l','console',/g\" /var/lib/heat-config/hooks/puppet" \
-a overcloud-full_build.qcow2
mv -f overcloud-full_build.qcow2 overcloud-full.qcow2