Merge "Handle failure of openstack endpoint"
diff --git a/stack.sh b/stack.sh
index d376bd9..305687d 100755
--- a/stack.sh
+++ b/stack.sh
@@ -211,6 +211,11 @@
# Additional repos
# ----------------
+# For debian/ubuntu make apt attempt to retry network ops on it's own
+if is_ubuntu; then
+ echo 'APT::Acquire::Retries "20";' | sudo tee /etc/apt/apt.conf.d/80retry
+fi
+
# Some distros need to add repos beyond the defaults provided by the vendor
# to pick up required packages.
diff --git a/tools/xen/prepare_guest_template.sh b/tools/xen/prepare_guest_template.sh
index eaab2fe..e6a7e02 100755
--- a/tools/xen/prepare_guest_template.sh
+++ b/tools/xen/prepare_guest_template.sh
@@ -70,7 +70,7 @@
else
echo "WARNING: no XenServer tools found, falling back to 5.6 tools"
TOOLS_URL="https://github.com/downloads/citrix-openstack/warehouse/xe-guest-utilities_5.6.100-651_amd64.deb"
- wget $TOOLS_URL -O $XS_TOOLS_FILE_NAME
+ curl --no-sessionid -L -o "$XS_TOOLS_FILE_NAME" $TOOLS_URL
cp $XS_TOOLS_FILE_NAME "${STAGING_DIR}${XS_TOOLS_PATH}"
rm -rf $XS_TOOLS_FILE_NAME
fi