openstack
/
sahara
Code Issues Proposed changes

sahara-image-pack: use curl for tarballs.openstack.org 

It seems that wget throws some errors from time to time when getting
content from tarballs.openstack.org.
The errors are SSL-related, maybe some interaction between the SSL libaries
of the libguestfs appliance and the load balancing configuration
of tarballs.openstack.org (SNI-based).
curl seems to be immune, so let's use it.

Story: 2003961
Task: 26890
Change-Id: Ia5793a4be8cde352329e861c46de8c4eeac4312e
This commit is contained in:
Luigi Toscano 2018-10-01 14:26:34 +02:00
parent 3a2b3f63b7
commit 12b270b092
15 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sahara/plugins/ambari/resources/images/centos/unlimited_security_artifacts
View File

@ -3,8 +3,8 @@
if [ ! -d /tmp/UnlimitedPolicy/ ]; then
if [ $test_only -eq 0 ]; then
mkdir /tmp/UnlimitedPolicy/
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
curl -sS https://tarballs.openstack.org/sahara-extra/dist/common-artifacts/local_policy.jar -o /tmp/UnlimitedPolicy/local_policy.jar
curl -sS 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
sahara/plugins/ambari/resources/images/common/add_jar
View File

@ -10,9 +10,9 @@ HADOOP_SWIFT_JAR_NAME=hadoop-openstack.jar
if [ ! -f $HDFS_LIB_DIR/$HADOOP_SWIFT_JAR_NAME ]; then
if [ $test_only -eq 0 ]; then
if [ -z "${swift_url:-}" ]; then
wget -O $HDFS_LIB_DIR/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI
curl -sS -o $HDFS_LIB_DIR/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI
else
wget -O $HDFS_LIB_DIR/$HADOOP_SWIFT_JAR_NAME $swift_url
curl -sS -o $HDFS_LIB_DIR/$HADOOP_SWIFT_JAR_NAME $swift_url
fi
if [ $? -ne 0 ]; then

2
sahara/plugins/cdh/v5_11_0/resources/images/common/add_jar
View File

@ -9,7 +9,7 @@ SWIFT_LIB_URI="$HADOOP_SWIFT_BUILD_LOCATION/hadoop-openstack-${hadoop}.jar"
HADOOP_SWIFT_JAR_NAME="hadoop-openstack.jar"
if [ $test_only -eq 0 ]; then
wget -O $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI
curl -sS -o $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI
if [ $? -ne 0 ]; then
printf "Could not download Swift Hadoop FS implementation.\nAborting\n"

2
sahara/plugins/cdh/v5_11_0/resources/images/common/install_extjs
View File

@ -8,7 +8,7 @@ extjs_archive=/tmp/${extjs_basepath}
extjs_folder="${extjs_basepath%.*}"
setup_extjs() {
wget -O $extjs_archive $EXTJS_DOWNLOAD_URL
curl -sS -o $extjs_archive $EXTJS_DOWNLOAD_URL
mkdir -p $EXTJS_DESTINATION_DIR
}

4
sahara/plugins/cdh/v5_11_0/resources/images/common/unlimited_security_artifacts
View File

@ -3,8 +3,8 @@
if [ ! -n /tmp/UnlimitedPolicy/ ]; then
if [ $test_only -eq 0 ]; then
mkdir /tmp/UnlimitedPolicy/
wget $unlimited_security_location/local_policy.jar -O /tmp/UnlimitedPolicy/local_policy.jar
wget $unlimited_security_location/US_export_policy.jar -O /tmp/UnlimitedPolicy/US_export_policy.jar
curl -sS $unlimited_security_location/local_policy.jar -o /tmp/UnlimitedPolicy/local_policy.jar
curl -sS $unlimited_security_location/US_export_policy.jar -o /tmp/UnlimitedPolicy/US_export_policy.jar
else
exit 0
fi

2
sahara/plugins/cdh/v5_13_0/resources/images/common/add_jar
View File

@ -9,7 +9,7 @@ SWIFT_LIB_URI="$HADOOP_SWIFT_BUILD_LOCATION/hadoop-openstack-${hadoop}.jar"
HADOOP_SWIFT_JAR_NAME="hadoop-openstack.jar"
if [ $test_only -eq 0 ]; then
wget -O $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI
curl -sS -o $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI
if [ $? -ne 0 ]; then
printf "Could not download Swift Hadoop FS implementation.\nAborting\n"

2
sahara/plugins/cdh/v5_13_0/resources/images/common/install_extjs
View File

@ -8,7 +8,7 @@ extjs_archive=/tmp/${extjs_basepath}
extjs_folder="${extjs_basepath%.*}"
setup_extjs() {
wget -O $extjs_archive $EXTJS_DOWNLOAD_URL
curl -sS -o $extjs_archive $EXTJS_DOWNLOAD_URL
mkdir -p $EXTJS_DESTINATION_DIR
}

4
sahara/plugins/cdh/v5_13_0/resources/images/common/unlimited_security_artifacts
View File

@ -3,8 +3,8 @@
if [ ! -n /tmp/UnlimitedPolicy/ ]; then
if [ $test_only -eq 0 ]; then
mkdir /tmp/UnlimitedPolicy/
wget $unlimited_security_location/local_policy.jar -O /tmp/UnlimitedPolicy/local_policy.jar
wget $unlimited_security_location/US_export_policy.jar -O /tmp/UnlimitedPolicy/US_export_policy.jar
curl -sS $unlimited_security_location/local_policy.jar -o /tmp/UnlimitedPolicy/local_policy.jar
curl -sS $unlimited_security_location/US_export_policy.jar -o /tmp/UnlimitedPolicy/US_export_policy.jar
else
exit 0
fi

2
sahara/plugins/cdh/v5_7_0/resources/images/common/add_jar
View File

@ -9,7 +9,7 @@ SWIFT_LIB_URI="$HADOOP_SWIFT_BUILD_LOCATION/hadoop-openstack-${hadoop}.jar"
HADOOP_SWIFT_JAR_NAME="hadoop-openstack.jar"
if [ $test_only -eq 0 ]; then
wget -O $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI
curl -sS -o $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI
if [ $? -ne 0 ]; then
printf "Could not download Swift Hadoop FS implementation.\nAborting\n"

2
sahara/plugins/cdh/v5_7_0/resources/images/common/install_extjs
View File

@ -8,7 +8,7 @@ extjs_archive=/tmp/${extjs_basepath}
extjs_folder="${extjs_basepath%.*}"
setup_extjs() {
wget -O $extjs_archive $EXTJS_DOWNLOAD_URL
curl -sS -o $extjs_archive $EXTJS_DOWNLOAD_URL
mkdir -p $EXTJS_DESTINATION_DIR
}

4
sahara/plugins/cdh/v5_7_0/resources/images/common/unlimited_security_artifacts
View File

@ -3,8 +3,8 @@
if [ ! -n /tmp/UnlimitedPolicy/ ]; then
if [ $test_only -eq 0 ]; then
mkdir /tmp/UnlimitedPolicy/
wget $unlimited_security_location/local_policy.jar -O /tmp/UnlimitedPolicy/local_policy.jar
wget $unlimited_security_location/US_export_policy.jar -O /tmp/UnlimitedPolicy/US_export_policy.jar
curl -sS $unlimited_security_location/local_policy.jar -o /tmp/UnlimitedPolicy/local_policy.jar
curl -sS $unlimited_security_location/US_export_policy.jar -o /tmp/UnlimitedPolicy/US_export_policy.jar
else
exit 0
fi

2
sahara/plugins/cdh/v5_9_0/resources/images/common/add_jar
View File

@ -9,7 +9,7 @@ SWIFT_LIB_URI="$HADOOP_SWIFT_BUILD_LOCATION/hadoop-openstack-${hadoop}.jar"
HADOOP_SWIFT_JAR_NAME="hadoop-openstack.jar"
if [ $test_only -eq 0 ]; then
wget -O $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI
curl -sS -o $hdfs_lib_dir/$HADOOP_SWIFT_JAR_NAME $SWIFT_LIB_URI
if [ $? -ne 0 ]; then
printf "Could not download Swift Hadoop FS implementation.\nAborting\n"

2
sahara/plugins/cdh/v5_9_0/resources/images/common/install_extjs
View File

@ -8,7 +8,7 @@ extjs_archive=/tmp/${extjs_basepath}
extjs_folder="${extjs_basepath%.*}"
setup_extjs() {
wget -O $extjs_archive $EXTJS_DOWNLOAD_URL
curl -sS -o $extjs_archive $EXTJS_DOWNLOAD_URL
mkdir -p $EXTJS_DESTINATION_DIR
}

4
sahara/plugins/cdh/v5_9_0/resources/images/common/unlimited_security_artifacts
View File

@ -3,8 +3,8 @@
if [ ! -n /tmp/UnlimitedPolicy/ ]; then
if [ $test_only -eq 0 ]; then
mkdir /tmp/UnlimitedPolicy/
wget $unlimited_security_location/local_policy.jar -O /tmp/UnlimitedPolicy/local_policy.jar
wget $unlimited_security_location/US_export_policy.jar -O /tmp/UnlimitedPolicy/US_export_policy.jar
curl -sS $unlimited_security_location/local_policy.jar -o /tmp/UnlimitedPolicy/local_policy.jar
curl -sS $unlimited_security_location/US_export_policy.jar -o /tmp/UnlimitedPolicy/US_export_policy.jar
else
exit 0
fi

2
sahara/plugins/mapr/resources/images/common/configure_extjs
View File

@ -9,7 +9,7 @@ extjs_archive=/tmp/${extjs_basepath}
extjs_folder="${extjs_basepath%.*}"
function setup_extjs {
wget -O $extjs_archive $EXTJS_DOWNLOAD_URL
curl -sS -o $extjs_archive $EXTJS_DOWNLOAD_URL
mkdir -p $EXTJS_DESTINATION_DIR
}