From da339829472ffcdc3044f79b76b6cd03608db191 Mon Sep 17 00:00:00 2001 From: Mate Lakat Date: Wed, 14 Nov 2012 12:45:10 +0000 Subject: [PATCH] Remove hardwired ansolabs urls Fixes bug 1078618. The files are no longer available on ansolabs' servers. The files were put on github, and this change modifies the location used in devstack. Change-Id: I1f512ad3b52d6b04d0e28ce6a532e11bfede1462 --- stack.sh | 2 +- tools/xen/prepare_guest_template.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stack.sh b/stack.sh index 40eab36e20..0a9e4d47c0 100755 --- a/stack.sh +++ b/stack.sh @@ -2003,7 +2003,7 @@ if is_service_enabled g-reg; then # Option to upload legacy ami-tty, which works with xenserver if [[ -n "$UPLOAD_LEGACY_TTY" ]]; then - IMAGE_URLS="${IMAGE_URLS:+${IMAGE_URLS},}http://images.ansolabs.com/tty.tgz" + IMAGE_URLS="${IMAGE_URLS:+${IMAGE_URLS},}https://github.com/downloads/citrix-openstack/warehouse/tty.tgz" fi for image_url in ${IMAGE_URLS//,/ }; do diff --git a/tools/xen/prepare_guest_template.sh b/tools/xen/prepare_guest_template.sh index baf9c3a25a..19bd2f841a 100755 --- a/tools/xen/prepare_guest_template.sh +++ b/tools/xen/prepare_guest_template.sh @@ -60,7 +60,7 @@ if [ -e "$ISO_DIR" ]; then rm -rf $TMP_DIR else echo "WARNING: no XenServer tools found, falling back to 5.6 tools" - TOOLS_URL="http://images.ansolabs.com/xen/xe-guest-utilities_5.6.100-651_amd64.deb" + 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 cp $XS_TOOLS_FILE_NAME "${STAGING_DIR}${XS_TOOLS_PATH}" rm -rf $XS_TOOLS_FILE_NAME