Merge "Get files from tarballs.o.o if possible (extjs, policy)" into stable/newton

This commit is contained in:
Jenkins 2017-07-15 19:16:00 +00:00 committed by Gerrit Code Review
commit 780c3de23e
5 changed files with 5 additions and 5 deletions

View File

@ -20,7 +20,7 @@ EXTJS_DESTINATION_DIR
EXTJS_DOWNLOAD_URL
:Required: No
:Default: ``http://dev.sencha.com/deploy/ext-2.2.zip``
:Default: ``http://tarballs.openstack.org/sahara/dist/common-artifacts/ext-2.2.zip``
:Description: The URL from where to download extjs.
EXTJS_NO_UNPACK

View File

@ -6,7 +6,7 @@ fi
set -eu
set -o pipefail
EXTJS_DOWNLOAD_URL=${EXTJS_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/ext-2.2.zip"}
EXTJS_DOWNLOAD_URL=${EXTJS_DOWNLOAD_URL:-"http://tarballs.openstack.org/sahara/dist/common-artifacts/ext-2.2.zip"}
extjs_archive=/tmp/$(basename $EXTJS_DOWNLOAD_URL)

View File

@ -6,7 +6,7 @@ fi
set -eu
set -o pipefail
EXTJS_DOWNLOAD_URL=${EXTJS_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/ext-2.2.zip"}
EXTJS_DOWNLOAD_URL=${EXTJS_DOWNLOAD_URL:-"http://tarballs.openstack.org/sahara/dist/common-artifacts/ext-2.2.zip"}
filename=$(basename $EXTJS_DOWNLOAD_URL)
cached_package="$DIB_IMAGE_CACHE/$filename"

View File

@ -9,5 +9,5 @@ Environment Variables
DIB_UNLIMITED_SECURITY_LOCATION
:Required: No
:Default: http://sahara-files.mirantis.com/kerberos-artifacts/
:Default: http://tarballs.openstack.org/sahara/dist/common-artifacts/
:Description: Place where UnlimitedSecurity polices are located

View File

@ -5,7 +5,7 @@ if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then
fi
set -eu
set -o pipefail
DIB_UNLIMITED_SECURITY_LOCATION="${DIB_UNLIMITED_SECURITY_LOCATION:-http://sahara-files.mirantis.com/kerberos-artifacts/}"
DIB_UNLIMITED_SECURITY_LOCATION="${DIB_UNLIMITED_SECURITY_LOCATION:-http://tarballs.openstack.org/sahara/dist/common-artifacts/}"
mkdir /tmp/UnlimitedPolicy/
wget $DIB_UNLIMITED_SECURITY_LOCATION/local_policy.jar -O /tmp/UnlimitedPolicy/local_policy.jar