diff --git a/leap-upgrades/lib/functions.sh b/leap-upgrades/lib/functions.sh index e56edad0..d5b875d0 100644 --- a/leap-upgrades/lib/functions.sh +++ b/leap-upgrades/lib/functions.sh @@ -299,7 +299,8 @@ EOC) function get_venv { # Attempt to prefetch a venv archive before building it. - if ! wget "${VENV_URL}/openstack-ansible-$1.tgz" "/opt/leap42/venvs/openstack-ansible-$1.tgz" > /dev/null; then + if ! wget "${VENV_URL}/openstack-ansible-$1.tgz" -O "/opt/leap42/venvs/openstack-ansible-$1.tgz"; then + rm "/opt/leap42/venvs/openstack-ansible-$1.tgz" build_venv "$1" else run_venv_prep "$1" diff --git a/leap-upgrades/lib/vars.sh b/leap-upgrades/lib/vars.sh index 13ac6ef3..2f7fda0e 100644 --- a/leap-upgrades/lib/vars.sh +++ b/leap-upgrades/lib/vars.sh @@ -30,4 +30,4 @@ export UPGRADE_UTILS="${UPGRADE_UTILS:-${SYSTEM_PATH}/upgrade-utilities}" # set the "VENV_URL" environment variable to the path where the venvs are kept. When running stage1 # this URL will be used to download the release built VENVS in the following format. # ${VENV_URL}/openstack-ansible-RELEASE_VERSION.tgz -export VENV_URL="${VENV_URL:-https://mirror.rackspace.com/rackspaceprivatecloud}" +export VENV_URL="${VENV_URL:-https://mirror.rackspace.com/rackspaceprivatecloud/venvs/leap-bundles}"