From 00f9124e3c8d86c11a1092176ce5b52323b02f6a Mon Sep 17 00:00:00 2001
From: Luigi Toscano <ltoscano@redhat.com>
Date: Fri, 7 Jul 2017 09:40:50 +0200
Subject: [PATCH] Get files from tarballs.o.o if possible (extjs, policy)
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
---
elements/extjs/README.rst | 2 +-
elements/extjs/install.d/80-install-extjs | 2 +-
elements/extjs/root.d/50-download-extjs | 2 +-
elements/kdc/README.rst | 2 +-
elements/kdc/pre-install.d/76-unlimited-security-artifacts | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/elements/extjs/README.rst b/elements/extjs/README.rst
index 3bbb5ebc..377554a4 100644
--- a/elements/extjs/README.rst
+++ b/elements/extjs/README.rst
@@ -20,7 +20,7 @@ EXTJS_DESTINATION_DIR
EXTJS_DOWNLOAD_URL
: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.
EXTJS_NO_UNPACK
diff --git a/elements/extjs/install.d/80-install-extjs b/elements/extjs/install.d/80-install-extjs
index 4ac47a36..5a9de945 100755
--- a/elements/extjs/install.d/80-install-extjs
+++ b/elements/extjs/install.d/80-install-extjs
@@ -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)
diff --git a/elements/extjs/root.d/50-download-extjs b/elements/extjs/root.d/50-download-extjs
index f969eb55..f5bc1999 100755
--- a/elements/extjs/root.d/50-download-extjs
+++ b/elements/extjs/root.d/50-download-extjs
@@ -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"
diff --git a/elements/kdc/README.rst b/elements/kdc/README.rst
index 2c1bd6b7..b7e12d5b 100644
--- a/elements/kdc/README.rst
+++ b/elements/kdc/README.rst
@@ -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
diff --git a/elements/kdc/pre-install.d/76-unlimited-security-artifacts b/elements/kdc/pre-install.d/76-unlimited-security-artifacts
index 4f1230fd..f9168d43 100755
--- a/elements/kdc/pre-install.d/76-unlimited-security-artifacts
+++ b/elements/kdc/pre-install.d/76-unlimited-security-artifacts
@@ -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