From 8ae30c08fa79559af33c3c3334c21e6fce34bc8e Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Tue, 27 Feb 2018 13:26:05 +0100 Subject: [PATCH] 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 --- doc/source/user/ambari-plugin.rst | 2 +- doc/source/user/cdh-plugin.rst | 2 +- doc/source/user/hadoop-swift.rst | 4 ++-- .../resources/images/centos/unlimited_security_artifacts | 4 ++-- sahara/plugins/ambari/resources/images/common/add_jar | 2 +- sahara/plugins/ambari/resources/images/image.yaml | 2 +- sahara/plugins/cdh/config_helper.py | 2 +- sahara/plugins/cdh/v5_11_0/resources/images/common/add_jar | 2 +- .../plugins/cdh/v5_11_0/resources/images/common/install_extjs | 2 +- sahara/plugins/cdh/v5_7_0/resources/images/common/add_jar | 2 +- .../plugins/cdh/v5_7_0/resources/images/common/install_extjs | 2 +- sahara/plugins/cdh/v5_9_0/resources/images/common/add_jar | 2 +- .../plugins/cdh/v5_9_0/resources/images/common/install_extjs | 2 +- sahara/plugins/kerberos.py | 2 +- sahara/plugins/mapr/resources/images/common/configure_extjs | 2 +- sahara/tests/unit/plugins/cdh/base_plugin_utils_test.py | 4 ++-- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/doc/source/user/ambari-plugin.rst b/doc/source/user/ambari-plugin.rst index 8dcebc0c2a..53bcf1a958 100644 --- a/doc/source/user/ambari-plugin.rst +++ b/doc/source/user/ambari-plugin.rst @@ -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 diff --git a/doc/source/user/cdh-plugin.rst b/doc/source/user/cdh-plugin.rst index ea2b437766..e819f129e0 100644 --- a/doc/source/user/cdh-plugin.rst +++ b/doc/source/user/cdh-plugin.rst @@ -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 diff --git a/doc/source/user/hadoop-swift.rst b/doc/source/user/hadoop-swift.rst index 3c52bacf78..1e4891123e 100644 --- a/doc/source/user/hadoop-swift.rst +++ b/doc/source/user/hadoop-swift.rst @@ -15,7 +15,7 @@ the most current features enabled. `Sahara Extra repository `_ * 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 diff --git a/sahara/plugins/ambari/resources/images/centos/unlimited_security_artifacts b/sahara/plugins/ambari/resources/images/centos/unlimited_security_artifacts index bcf70675bf..78f80cc865 100644 --- a/sahara/plugins/ambari/resources/images/centos/unlimited_security_artifacts +++ b/sahara/plugins/ambari/resources/images/centos/unlimited_security_artifacts @@ -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 diff --git a/sahara/plugins/ambari/resources/images/common/add_jar b/sahara/plugins/ambari/resources/images/common/add_jar index 9c0560be45..3e81dd5a89 100644 --- a/sahara/plugins/ambari/resources/images/common/add_jar +++ b/sahara/plugins/ambari/resources/images/common/add_jar @@ -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 diff --git a/sahara/plugins/ambari/resources/images/image.yaml b/sahara/plugins/ambari/resources/images/image.yaml index 80e0b94a78..c597e9eaa9 100644 --- a/sahara/plugins/ambari/resources/images/image.yaml +++ b/sahara/plugins/ambari/resources/images/image.yaml @@ -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 diff --git a/sahara/plugins/cdh/config_helper.py b/sahara/plugins/cdh/config_helper.py index 6eac52b15f..3d19ed7fec 100644 --- a/sahara/plugins/cdh/config_helper.py +++ b/sahara/plugins/cdh/config_helper.py @@ -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( diff --git a/sahara/plugins/cdh/v5_11_0/resources/images/common/add_jar b/sahara/plugins/cdh/v5_11_0/resources/images/common/add_jar index e66d067ccd..7b73206dbe 100644 --- a/sahara/plugins/cdh/v5_11_0/resources/images/common/add_jar +++ b/sahara/plugins/cdh/v5_11_0/resources/images/common/add_jar @@ -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" diff --git a/sahara/plugins/cdh/v5_11_0/resources/images/common/install_extjs b/sahara/plugins/cdh/v5_11_0/resources/images/common/install_extjs index b421d5fbd6..4cf7c7d7f3 100644 --- a/sahara/plugins/cdh/v5_11_0/resources/images/common/install_extjs +++ b/sahara/plugins/cdh/v5_11_0/resources/images/common/install_extjs @@ -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) diff --git a/sahara/plugins/cdh/v5_7_0/resources/images/common/add_jar b/sahara/plugins/cdh/v5_7_0/resources/images/common/add_jar index e66d067ccd..7b73206dbe 100644 --- a/sahara/plugins/cdh/v5_7_0/resources/images/common/add_jar +++ b/sahara/plugins/cdh/v5_7_0/resources/images/common/add_jar @@ -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" diff --git a/sahara/plugins/cdh/v5_7_0/resources/images/common/install_extjs b/sahara/plugins/cdh/v5_7_0/resources/images/common/install_extjs index b421d5fbd6..4cf7c7d7f3 100644 --- a/sahara/plugins/cdh/v5_7_0/resources/images/common/install_extjs +++ b/sahara/plugins/cdh/v5_7_0/resources/images/common/install_extjs @@ -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) diff --git a/sahara/plugins/cdh/v5_9_0/resources/images/common/add_jar b/sahara/plugins/cdh/v5_9_0/resources/images/common/add_jar index e66d067ccd..7b73206dbe 100644 --- a/sahara/plugins/cdh/v5_9_0/resources/images/common/add_jar +++ b/sahara/plugins/cdh/v5_9_0/resources/images/common/add_jar @@ -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" diff --git a/sahara/plugins/cdh/v5_9_0/resources/images/common/install_extjs b/sahara/plugins/cdh/v5_9_0/resources/images/common/install_extjs index b421d5fbd6..4cf7c7d7f3 100644 --- a/sahara/plugins/cdh/v5_9_0/resources/images/common/install_extjs +++ b/sahara/plugins/cdh/v5_9_0/resources/images/common/install_extjs @@ -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) diff --git a/sahara/plugins/kerberos.py b/sahara/plugins/kerberos.py index 3ca8a88176..6db7114358 100644 --- a/sahara/plugins/kerberos.py +++ b/sahara/plugins/kerberos.py @@ -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') diff --git a/sahara/plugins/mapr/resources/images/common/configure_extjs b/sahara/plugins/mapr/resources/images/common/configure_extjs index 2fcb93d788..ce49daf8ad 100644 --- a/sahara/plugins/mapr/resources/images/common/configure_extjs +++ b/sahara/plugins/mapr/resources/images/common/configure_extjs @@ -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) diff --git a/sahara/tests/unit/plugins/cdh/base_plugin_utils_test.py b/sahara/tests/unit/plugins/cdh/base_plugin_utils_test.py index 40e51bfc43..a7d19f7f96 100644 --- a/sahara/tests/unit/plugins/cdh/base_plugin_utils_test.py +++ b/sahara/tests/unit/plugins/cdh/base_plugin_utils_test.py @@ -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',