Update the links to artifacts (removing sahara-files too)
The canonical location for the artifacts going on is
tarballs.openstack.org/sahara-extra/, so fix the link to use that
and also use https.
Moreover, since the last tarball required for building images
is available on tarballs.openstack.org, remove the last references
to sahara-files for artifacts and documentation
(the new location was used already for a while in few places).
there are still few references to sahara-files,
but they are all about CentOS6 which is no more supported
by diskimage-builder, and should be removed separately.
Change-Id: Iab5a4d50a0abc6ab278837b6a9efd5e30f31c44a
(cherry picked from commit 8cdff5d71f
)
This commit is contained in:
parent
5cad99d24c
commit
05051fc265
|
@ -475,8 +475,8 @@ image_create() {
|
|||
|
||||
if [ -z "$PLUGIN" -o "$PLUGIN" = "vanilla" ]; then
|
||||
export HIVE_VERSION=${HIVE_VERSION:-"0.11.0"}
|
||||
export HADOOP_V2_7_1_NATIVE_LIBS_DOWNLOAD_URL=${HADOOP_V2_7_1_NATIVE_LIBS_DOWNLOAD_URL:-"https://tarballs.openstack.org/sahara/dist/common-artifacts/hadoop-native-libs-2.7.1.tar.gz"}
|
||||
export OOZIE_HADOOP_V2_7_1_DOWNLOAD_URL=${OOZIE_HADOOP_V2_7_1_FILE:-"http://sahara-files.mirantis.com/oozie-4.2.0-hadoop-2.7.1.tar.gz"}
|
||||
export HADOOP_V2_7_1_NATIVE_LIBS_DOWNLOAD_URL=${HADOOP_V2_7_1_NATIVE_LIBS_DOWNLOAD_URL:-"https://tarballs.openstack.org/sahara-extra/dist/common-artifacts/hadoop-native-libs-2.7.1.tar.gz"}
|
||||
export OOZIE_HADOOP_V2_7_1_DOWNLOAD_URL=${OOZIE_HADOOP_V2_7_1_FILE:-"https://tarballs.openstack.org/sahara-extra/dist/oozie/oozie-4.2.0-hadoop-2.7.1.tar.gz"}
|
||||
export DIB_HDFS_LIB_DIR="/opt/hadoop/share/hadoop/tools/lib"
|
||||
export plugin_type="vanilla"
|
||||
|
||||
|
|
|
@ -63,6 +63,7 @@ You can use 'JAVA_DOWNLOAD_URL' parameter to specify download link for JDK (tarb
|
|||
'DIB_IMAGE_SIZE' is parameter that specifes a volume of hard disk of instance. You need to specify it because Fedora and CentOS don't use all available volume.
|
||||
If you have already downloaded the jdk package, move it to "elements/hadoop/install.d/" and use its filename as 'JAVA_FILE' parameter.
|
||||
In order of working EDP components with Sahara DIB images you need pre-installed Oozie libs.
|
||||
Use OOZIE_DOWNLOAD_URL to specify link to Oozie archive (tar.gz). For example we have built Oozie libs here:
|
||||
http://sahara-files.mirantis.com/oozie-4.0.0.tar.gz
|
||||
Use OOZIE_DOWNLOAD_URL to specify link to Oozie archive (tar.gz). For example the Oozie libraries
|
||||
for Hadoop 2.7.1 are available from:
|
||||
https://tarballs.openstack.org/sahara-extra/dist/oozie/oozie-4.2.0-hadoop-2.7.1.tar.gz
|
||||
If you have already downloaded archive, move it to "elements/oozie/install.d/" and use its filename as 'OOZIE_FILE' parameter.
|
||||
|
|
|
@ -20,7 +20,7 @@ EXTJS_DESTINATION_DIR
|
|||
|
||||
EXTJS_DOWNLOAD_URL
|
||||
:Required: No
|
||||
:Default: ``http://tarballs.openstack.org/sahara/dist/common-artifacts/ext-2.2.zip``
|
||||
:Default: ``https://tarballs.openstack.org/sahara-extra/dist/common-artifacts/ext-2.2.zip``
|
||||
:Description: The URL from where to download extjs.
|
||||
|
||||
EXTJS_NO_UNPACK
|
||||
|
|
|
@ -6,7 +6,7 @@ fi
|
|||
set -eu
|
||||
set -o pipefail
|
||||
|
||||
EXTJS_DOWNLOAD_URL=${EXTJS_DOWNLOAD_URL:-"http://tarballs.openstack.org/sahara/dist/common-artifacts/ext-2.2.zip"}
|
||||
EXTJS_DOWNLOAD_URL=${EXTJS_DOWNLOAD_URL:-"https://tarballs.openstack.org/sahara-extra/dist/common-artifacts/ext-2.2.zip"}
|
||||
|
||||
extjs_archive=/tmp/$(basename $EXTJS_DOWNLOAD_URL)
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ fi
|
|||
set -eu
|
||||
set -o pipefail
|
||||
|
||||
EXTJS_DOWNLOAD_URL=${EXTJS_DOWNLOAD_URL:-"http://tarballs.openstack.org/sahara/dist/common-artifacts/ext-2.2.zip"}
|
||||
EXTJS_DOWNLOAD_URL=${EXTJS_DOWNLOAD_URL:-"https://tarballs.openstack.org/sahara-extra/dist/common-artifacts/ext-2.2.zip"}
|
||||
|
||||
filename=$(basename $EXTJS_DOWNLOAD_URL)
|
||||
cached_package="$DIB_IMAGE_CACHE/$filename"
|
||||
|
|
|
@ -9,5 +9,5 @@ Environment Variables
|
|||
|
||||
DIB_UNLIMITED_SECURITY_LOCATION
|
||||
:Required: No
|
||||
:Default: http://tarballs.openstack.org/sahara/dist/common-artifacts/
|
||||
:Default: https://tarballs.openstack.org/sahara-extra/dist/common-artifacts/
|
||||
:Description: Place where UnlimitedSecurity polices are located
|
||||
|
|
|
@ -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://tarballs.openstack.org/sahara/dist/common-artifacts/}"
|
||||
DIB_UNLIMITED_SECURITY_LOCATION="${DIB_UNLIMITED_SECURITY_LOCATION:-https://tarballs.openstack.org/sahara-extra/dist/common-artifacts/}"
|
||||
|
||||
mkdir /tmp/UnlimitedPolicy/
|
||||
wget $DIB_UNLIMITED_SECURITY_LOCATION/local_policy.jar -O /tmp/UnlimitedPolicy/local_policy.jar
|
||||
|
|
|
@ -11,7 +11,7 @@ Environment Variables
|
|||
|
||||
swift_url
|
||||
:Required: No
|
||||
:Default: http://sahara-files.mirantis.com/hadoop-swift/hadoop-swift-latest.jar
|
||||
:Default: https://tarballs.openstack.org/sahara-extra/dist/hadoop-openstack/master/hadoop-openstack-2.7.1.jar
|
||||
:Description: Location of the swift jar file.
|
||||
|
||||
DIB_HDFS_LIB_DIR
|
||||
|
|
|
@ -37,7 +37,7 @@ case "$plugin_type" in
|
|||
;;
|
||||
esac
|
||||
|
||||
HADOOP_SWIFT_BUILD_LOCATION="http://tarballs.openstack.org/sahara/dist/hadoop-openstack/master"
|
||||
HADOOP_SWIFT_BUILD_LOCATION="https://tarballs.openstack.org/sahara-extra/dist/hadoop-openstack/master"
|
||||
HDFS_LIB_DIR=${DIB_HDFS_LIB_DIR:-"/usr/share/hadoop/lib"}
|
||||
SWIFT_LIB_URI="$HADOOP_SWIFT_BUILD_LOCATION/hadoop-openstack-${hadoop}.jar"
|
||||
HADOOP_SWIFT_JAR_NAME=${DIB_HADOOP_SWIFT_JAR_NAME:-"hadoop-openstack.jar"}
|
||||
|
|
Loading…
Reference in New Issue