openstack
/
sahara-image-elements
Code Issues Proposed changes

Force trusty on Spark, Vanilla and Storm Ubuntu images 

The other images (Ambari, CDH, MapR) do not support Xenial.
Spark depends on CDH, and while Vanilla and Storm may support Xenial,
there are other packages and dependencies that need to be fixed first.

Change-Id: Ied720e35d2a5372f228861b104cca1afddaf26f9
This commit is contained in:
Luigi Toscano 2016-11-25 14:54:33 +01:00
parent ca7d2ea213
commit 9ac38b939a
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
diskimage-create/diskimage-create.sh
View File

@ -506,7 +506,9 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "vanilla" ]; then
if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "2.7.1" ]; then
export DIB_HADOOP_VERSION=${DIB_HADOOP_VERSION_2_7_1:-"2.7.1"}
export ubuntu_image_name=${ubuntu_vanilla_hadoop_2_7_1_image_name:-"ubuntu_sahara_vanilla_hadoop_2_7_1_latest"}
export DIB_RELEASE=${DIB_RELEASE:-trusty}
image_create ubuntu $ubuntu_image_name $ubuntu_elements_sequence
unset DIB_RELEASE
fi
unset DIB_CLOUD_INIT_DATASOURCES
fi
@ -573,6 +575,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "spark" ]; then
export ubuntu_image_name=${ubuntu_spark_image_name:-"ubuntu_sahara_spark_latest"}
# Creating Ubuntu cloud image
export DIB_RELEASE=${DIB_RELEASE:-trusty}
image_create ubuntu $ubuntu_image_name $ubuntu_elements_sequence
unset DIB_CLOUD_INIT_DATASOURCES
unset DIB_HDFS_LIB_DIR
@ -580,6 +583,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "spark" ]; then
unset DIB_CDH_VERSION
unset DIB_SPARK_VERSION
unset DIB_HADOOP_VERSION
unset DIB_RELEASE
unset plugin_type
fi
@ -597,7 +601,9 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "storm" ]; then
ubuntu_elements_sequence="$JAVA_ELEMENT zookeeper storm"
# Creating Ubuntu cloud image
export DIB_RELEASE=${DIB_RELEASE:-trusty}
image_create ubuntu $ubuntu_image_name $ubuntu_elements_sequence
unset DIB_RELEASE
unset DIB_CLOUD_INIT_DATASOURCES
fi