openstack/sahara-image-elements
Code Issues Proposed changes

Get files from tarballs.o.o if possible (extjs, policy)

Browse Source 
Few artifacts are already available on tarballs.openstack.org; use
them instead of sahara-files (the others should be migrated as well).

Change-Id: I5151b43fab56a071793097dba72aca6e9fb19196
This commit is contained in:
Luigi Toscano 2017-07-07 09:40:50 +02:00
parent 52c39ec6d0
commit 00f9124e3c
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
elements/extjs/README.rst
View File

@ -20,7 +20,7 @@ EXTJS_DESTINATION_DIR
EXTJS_DOWNLOAD_URL EXTJS_DOWNLOAD_URL
:Required: No :Required: No
:Default: ``http://sahara-files.mirantis.com/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. :Description: The URL from where to download extjs.
EXTJS_NO_UNPACK EXTJS_NO_UNPACK

2
elements/extjs/install.d/80-install-extjs
View File

@ -6,7 +6,7 @@ fi
set -eu set -eu
set -o pipefail 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) extjs_archive=/tmp/$(basename $EXTJS_DOWNLOAD_URL)

2
elements/extjs/root.d/50-download-extjs
View File

@ -6,7 +6,7 @@ fi
set -eu set -eu
set -o pipefail 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) filename=$(basename $EXTJS_DOWNLOAD_URL)
cached_package="$DIB_IMAGE_CACHE/$filename" cached_package="$DIB_IMAGE_CACHE/$filename"

2
elements/kdc/README.rst
View File

@ -9,5 +9,5 @@ Environment Variables
DIB_UNLIMITED_SECURITY_LOCATION DIB_UNLIMITED_SECURITY_LOCATION
:Required: No :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 :Description: Place where UnlimitedSecurity polices are located

2
elements/kdc/pre-install.d/76-unlimited-security-artifacts
View File

@ -5,7 +5,7 @@ if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then
fi fi
set -eu set -eu
set -o pipefail 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/ mkdir /tmp/UnlimitedPolicy/
wget $DIB_UNLIMITED_SECURITY_LOCATION/local_policy.jar -O /tmp/UnlimitedPolicy/local_policy.jar wget $DIB_UNLIMITED_SECURITY_LOCATION/local_policy.jar -O /tmp/UnlimitedPolicy/local_policy.jar