From 9ac38b939ae8cfea8c2ad62dffce78a1ca0fc2f0 Mon Sep 17 00:00:00 2001
From: Luigi Toscano <ltoscano@redhat.com>
Date: Fri, 25 Nov 2016 14:54:33 +0100
Subject: [PATCH] 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
---
 diskimage-create/diskimage-create.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh
index 9f3cd4f3..0cfba009 100755
--- a/diskimage-create/diskimage-create.sh
+++ b/diskimage-create/diskimage-create.sh
@@ -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