Migrate the artifact link to sahara-extra, use https
The stable link for artifacts is going to be tarballs.openstack.org/sahara-extra, which matches the name of the repository and it is more consistent with the way the publishing system works. Also use https. Change-Id: Iacce6e6397b2d8d812964d56a33f9ea82901a3d6
This commit is contained in:
parent
a7a22afbcc
commit
8ae30c08fa
|
@ -89,7 +89,7 @@ complete a few steps below.
|
|||
|
||||
* Ensure that you have the latest hadoop-openstack jar file distributed
|
||||
on your cluster nodes. You can download one at
|
||||
``http://tarballs.openstack.org/sahara/dist/``
|
||||
``https://tarballs.openstack.org/sahara-extra/dist/``
|
||||
|
||||
* Sahara will create principals along with keytabs for system users
|
||||
like ``oozie``, ``hdfs`` and ``spark`` so that you will not have to
|
||||
|
|
|
@ -153,7 +153,7 @@ complete a few steps below.
|
|||
|
||||
* Ensure that you have the latest hadoop-openstack jar file distributed
|
||||
on your cluster nodes. You can download one at
|
||||
``http://tarballs.openstack.org/sahara/dist/``
|
||||
``https://tarballs.openstack.org/sahara-extra/dist/``
|
||||
|
||||
* Sahara will create principals along with keytabs for system users
|
||||
like ``hdfs`` and ``spark`` so that you will not have to
|
||||
|
|
|
@ -15,7 +15,7 @@ the most current features enabled.
|
|||
`Sahara Extra repository <https://git.openstack.org/cgit/openstack/sahara-extra>`_
|
||||
|
||||
* The latest compiled version of the jar for this component can be downloaded
|
||||
from http://tarballs.openstack.org/sahara/dist/hadoop-openstack/master/
|
||||
from https://tarballs.openstack.org/sahara-extra/dist/hadoop-openstack/master/
|
||||
|
||||
Now the latest version of this jar (which uses Keystone API v3) is used in
|
||||
the plugins' images automatically during build of these images. But for
|
||||
|
@ -27,7 +27,7 @@ Hadoop patching
|
|||
You may build the jar file yourself by choosing the latest patch from the
|
||||
Sahara Extra repository and using Maven to build with the pom.xml file
|
||||
provided. Or you may get the latest jar pre-built at
|
||||
http://tarballs.openstack.org/sahara/dist/hadoop-openstack/master/
|
||||
https://tarballs.openstack.org/sahara-extra/dist/hadoop-openstack/master/
|
||||
|
||||
You will need to put this file into the hadoop libraries
|
||||
(e.g. /usr/lib/share/hadoop/lib, it depends on the plugin which you use) on
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
if [ ! -d /tmp/UnlimitedPolicy/ ]; then
|
||||
if [ $test_only -eq 0 ]; then
|
||||
mkdir /tmp/UnlimitedPolicy/
|
||||
wget http://tarballs.openstack.org/sahara/dist/common-artifacts/local_policy.jar -O /tmp/UnlimitedPolicy/local_policy.jar
|
||||
wget http://tarballs.openstack.org/sahara/dist/common-artifacts/US_export_policy.jar -O /tmp/UnlimitedPolicy/US_export_policy.jar
|
||||
wget https://tarballs.openstack.org/sahara-extra/dist/common-artifacts/local_policy.jar -O /tmp/UnlimitedPolicy/local_policy.jar
|
||||
wget https://tarballs.openstack.org/sahara-extra/dist/common-artifacts/US_export_policy.jar -O /tmp/UnlimitedPolicy/US_export_policy.jar
|
||||
else
|
||||
exit 0
|
||||
fi
|
||||
|
|
|
@ -4,7 +4,7 @@ hadoop="2.7.1"
|
|||
|
||||
HDFS_LIB_DIR=${hdfs_lib_dir:-"/usr/share/hadoop/lib"}
|
||||
JAR_BUILD_DATE="2016-03-17"
|
||||
SWIFT_LIB_URI="http://tarballs.openstack.org/sahara/dist/hadoop-openstack/hadoop-openstack-${hadoop}.jar"
|
||||
SWIFT_LIB_URI="https://tarballs.openstack.org/sahara-extra/dist/hadoop-openstack/hadoop-openstack-${hadoop}.jar"
|
||||
HADOOP_SWIFT_JAR_NAME=hadoop-openstack.jar
|
||||
|
||||
if [ ! -f $HDFS_LIB_DIR/$HADOOP_SWIFT_JAR_NAME ]; then
|
||||
|
|
|
@ -17,7 +17,7 @@ arguments:
|
|||
description: The path to HDFS lib. Defaults to /opt.
|
||||
required: False
|
||||
swift_url:
|
||||
default: https://tarballs.openstack.org/sahara/dist/hadoop-openstack/master/
|
||||
default: https://tarballs.openstack.org/sahara-extra/dist/hadoop-openstack/master/
|
||||
description: Location of the swift jar file.
|
||||
required: False
|
||||
|
||||
|
|
|
@ -58,7 +58,7 @@ class ConfigHelper(object):
|
|||
" will be downloaded by VMs."))
|
||||
|
||||
DEFAULT_EXTJS_LIB_URL = (
|
||||
'http://tarballs.openstack.org/sahara/dist/common-artifacts/'
|
||||
'https://tarballs.openstack.org/sahara-extra/dist/common-artifacts/'
|
||||
'ext-2.2.zip')
|
||||
|
||||
EXTJS_LIB_URL = p.Config(
|
||||
|
|
|
@ -4,7 +4,7 @@ hadoop="2.6.0"
|
|||
|
||||
HADOOP_SWIFT_JAR_NAME="hadoop-openstack-$hadoop-cdh$plugin_version.jar"
|
||||
|
||||
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"
|
||||
SWIFT_LIB_URI="$HADOOP_SWIFT_BUILD_LOCATION/hadoop-openstack-${hadoop}.jar"
|
||||
HADOOP_SWIFT_JAR_NAME="hadoop-openstack.jar"
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
EXTJS_DESTINATION_DIR="/var/lib/oozie"
|
||||
EXTJS_DOWNLOAD_URL="http://tarballs.openstack.org/sahara/dist/common-artifacts/ext-2.2.zip"
|
||||
EXTJS_DOWNLOAD_URL="https://tarballs.openstack.org/sahara-extra/dist/common-artifacts/ext-2.2.zip"
|
||||
|
||||
extjs_archive=/tmp/$(basename $EXTJS_DOWNLOAD_URL)
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ hadoop="2.6.0"
|
|||
|
||||
HADOOP_SWIFT_JAR_NAME="hadoop-openstack-$hadoop-cdh$plugin_version.jar"
|
||||
|
||||
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"
|
||||
SWIFT_LIB_URI="$HADOOP_SWIFT_BUILD_LOCATION/hadoop-openstack-${hadoop}.jar"
|
||||
HADOOP_SWIFT_JAR_NAME="hadoop-openstack.jar"
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
EXTJS_DESTINATION_DIR="/var/lib/oozie"
|
||||
EXTJS_DOWNLOAD_URL="http://tarballs.openstack.org/sahara/dist/common-artifacts/ext-2.2.zip"
|
||||
EXTJS_DOWNLOAD_URL="https://tarballs.openstack.org/sahara-extra/dist/common-artifacts/ext-2.2.zip"
|
||||
|
||||
extjs_archive=/tmp/$(basename $EXTJS_DOWNLOAD_URL)
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ hadoop="2.6.0"
|
|||
|
||||
HADOOP_SWIFT_JAR_NAME="hadoop-openstack-$hadoop-cdh$plugin_version.jar"
|
||||
|
||||
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"
|
||||
SWIFT_LIB_URI="$HADOOP_SWIFT_BUILD_LOCATION/hadoop-openstack-${hadoop}.jar"
|
||||
HADOOP_SWIFT_JAR_NAME="hadoop-openstack.jar"
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
EXTJS_DESTINATION_DIR="/var/lib/oozie"
|
||||
EXTJS_DOWNLOAD_URL="http://tarballs.openstack.org/sahara/dist/common-artifacts/ext-2.2.zip"
|
||||
EXTJS_DOWNLOAD_URL="https://tarballs.openstack.org/sahara-extra/dist/common-artifacts/ext-2.2.zip"
|
||||
|
||||
extjs_archive=/tmp/$(basename $EXTJS_DOWNLOAD_URL)
|
||||
|
||||
|
|
|
@ -70,7 +70,7 @@ admin_password = _config(
|
|||
name='Admin password', config_type='string', default_value='')
|
||||
policy_url = _config(
|
||||
name="JCE libraries", config_type='string',
|
||||
default_value=('http://tarballs.openstack.org/sahara/dist/'
|
||||
default_value=('https://tarballs.openstack.org/sahara-extra/dist/'
|
||||
'common-artifacts/'),
|
||||
description=_('Java Cryptography Extension (JCE) '
|
||||
'Unlimited Strength Jurisdiction Policy Files location')
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
|
||||
EXTJS_DESTINATION_DIR="/opt/mapr-repository"
|
||||
EXTJS_DOWNLOAD_URL="http://tarballs.openstack.org/sahara/dist/common-artifacts/ext-2.2.zip"
|
||||
EXTJS_DOWNLOAD_URL="https://tarballs.openstack.org/sahara-extra/dist/common-artifacts/ext-2.2.zip"
|
||||
EXTJS_NO_UNPACK=1
|
||||
|
||||
extjs_archive=/tmp/$(basename $EXTJS_DOWNLOAD_URL)
|
||||
|
|
|
@ -250,8 +250,8 @@ class TestPluginUtils(b.SaharaTestCase):
|
|||
calls = [mock.call('ls /var/lib/oozie/ext-2.2',
|
||||
raise_when_error=False),
|
||||
mock.call("curl -L -o '/var/lib/oozie/extjs.zip'"
|
||||
" http://tarballs.openstack.org/sahara/dist/"
|
||||
"common-artifacts/ext-2.2.zip",
|
||||
" https://tarballs.openstack.org/sahara-extra/"
|
||||
"dist/common-artifacts/ext-2.2.zip",
|
||||
run_as_root=True),
|
||||
mock.call('unzip /var/lib/oozie/extjs.zip'
|
||||
' -d /var/lib/oozie',
|
||||
|
|
Loading…
Reference in New Issue