summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-12-12 09:59:10 +0000
committerGerrit Code Review <review@openstack.org>2014-12-12 09:59:10 +0000
commit63a5bd867e6dbf821f032b3352ed42d14791c739 (patch)
tree78adf82db4ff98b6701949324a67931b108084e5
parent091330418b859dc359be9d3e44cedb7c6679ab9f (diff)
parentf2a0837046b2ef448fcbe134dfe107d037bc43c6 (diff)
Merge "Adding ability to build images for Hadoop 2.6.0"2015.1.0b1
-rwxr-xr-xdiskimage-create/diskimage-create.sh24
-rwxr-xr-xelements/hadoop/post-install.d/40-setup-hadoop3
-rwxr-xr-xelements/oozie/install.d/50-setup-oozie3
-rwxr-xr-xelements/oozie/root.d/0-check5
4 files changed, 33 insertions, 2 deletions
diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh
index 099af31..9f85fa6 100755
--- a/diskimage-create/diskimage-create.sh
+++ b/diskimage-create/diskimage-create.sh
@@ -23,7 +23,7 @@ usage() {
23 echo "Usage: $(basename $0)" 23 echo "Usage: $(basename $0)"
24 echo " [-p vanilla|spark|hdp|cloudera|storm|mapr]" 24 echo " [-p vanilla|spark|hdp|cloudera|storm|mapr]"
25 echo " [-i ubuntu|fedora|centos]" 25 echo " [-i ubuntu|fedora|centos]"
26 echo " [-v 1|2|2.3|2.4|plain]" 26 echo " [-v 1|2|2.3|2.4|2.6|plain]"
27 echo " [-r 3.1.1|4.0.1]" 27 echo " [-r 3.1.1|4.0.1]"
28 echo " [-d]" 28 echo " [-d]"
29 echo " [-m]" 29 echo " [-m]"
@@ -112,7 +112,7 @@ if [ -n "$BASE_IMAGE_OS" -a "$BASE_IMAGE_OS" != "ubuntu" -a "$BASE_IMAGE_OS" !=
112fi 112fi
113 113
114if [ -n "$HADOOP_VERSION" -a "$HADOOP_VERSION" != "1" -a "$HADOOP_VERSION" != "2" -a "$HADOOP_VERSION" != "plain" ]; then 114if [ -n "$HADOOP_VERSION" -a "$HADOOP_VERSION" != "1" -a "$HADOOP_VERSION" != "2" -a "$HADOOP_VERSION" != "plain" ]; then
115 if [ "$PLUGIN" = "vanilla" -a "$HADOOP_VERSION" != "1" -a "$HADOOP_VERSION" != "2.3" -a "$HADOOP_VERSION" != "2.4" -a "$HADOOP_VERSION" != "plain" ]; then 115 if [ "$PLUGIN" = "vanilla" -a "$HADOOP_VERSION" != "1" -a "$HADOOP_VERSION" != "2.3" -a "$HADOOP_VERSION" != "2.4" -a "$HADOOP_VERSION" != "2.6" -a "$HADOOP_VERSION" != "plain" ]; then
116 echo -e "Unknown hadoop version selected.\nAborting" 116 echo -e "Unknown hadoop version selected.\nAborting"
117 exit 1 117 exit 1
118 fi 118 fi
@@ -227,8 +227,10 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "vanilla" ]; then
227 export OOZIE_HADOOP_V1_DOWNLOAD_URL=${OOZIE_HADOOP_V1_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/oozie-4.0.0.tar.gz"} 227 export OOZIE_HADOOP_V1_DOWNLOAD_URL=${OOZIE_HADOOP_V1_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/oozie-4.0.0.tar.gz"}
228 export OOZIE_HADOOP_V2_3_DOWNLOAD_URL=${OOZIE_HADOOP_V2_3_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/oozie-4.0.0-hadoop-2.3.0.tar.gz"} 228 export OOZIE_HADOOP_V2_3_DOWNLOAD_URL=${OOZIE_HADOOP_V2_3_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/oozie-4.0.0-hadoop-2.3.0.tar.gz"}
229 export OOZIE_HADOOP_V2_4_DOWNLOAD_URL=${OOZIE_HADOOP_V2_4_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/oozie-juno-4.0.1-hadoop-2.4.1.tar.gz"} 229 export OOZIE_HADOOP_V2_4_DOWNLOAD_URL=${OOZIE_HADOOP_V2_4_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/oozie-juno-4.0.1-hadoop-2.4.1.tar.gz"}
230 export OOZIE_HADOOP_V2_6_DOWNLOAD_URL=${OOZIE_HADOOP_V2_6_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/oozie-4.0.1-hadoop-2.6.0.tar.gz"}
230 export HADOOP_V2_3_NATIVE_LIBS_DOWNLOAD_URL=${HADOOP_V2_3_NATIVE_LIBS_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/hadoop-2.3.0-native-libs.tar.gz"} 231 export HADOOP_V2_3_NATIVE_LIBS_DOWNLOAD_URL=${HADOOP_V2_3_NATIVE_LIBS_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/hadoop-2.3.0-native-libs.tar.gz"}
231 export HADOOP_V2_4_NATIVE_LIBS_DOWNLOAD_URL=${HADOOP_V2_4_NATIVE_LIBS_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/hadoop-native-libs-juno-2.4.1.tar.gz"} 232 export HADOOP_V2_4_NATIVE_LIBS_DOWNLOAD_URL=${HADOOP_V2_4_NATIVE_LIBS_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/hadoop-native-libs-juno-2.4.1.tar.gz"}
233 export HADOOP_V2_6_NATIVE_LIBS_DOWNLOAD_URL=${HADOOP_V2_6_NATIVE_LIBS_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/hadoop-native-libs-2.6.0.tar.gz"}
232 export EXTJS_DOWNLOAD_URL=${EXTJS_DOWNLOAD_URL:-"http://extjs.com/deploy/ext-2.2.zip"} 234 export EXTJS_DOWNLOAD_URL=${EXTJS_DOWNLOAD_URL:-"http://extjs.com/deploy/ext-2.2.zip"}
233 export HIVE_VERSION=${HIVE_VERSION:-"0.11.0"} 235 export HIVE_VERSION=${HIVE_VERSION:-"0.11.0"}
234 236
@@ -284,6 +286,12 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "vanilla" ]; then
284 disk-image-create $ubuntu_elements_sequence -o $ubuntu_image_name 286 disk-image-create $ubuntu_elements_sequence -o $ubuntu_image_name
285 mv $ubuntu_image_name.qcow2 ../ 287 mv $ubuntu_image_name.qcow2 ../
286 fi 288 fi
289 if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "2.6" ]; then
290 export DIB_HADOOP_VERSION=${DIB_HADOOP_VERSION_2_6:-"2.6.0"}
291 export ubuntu_image_name=${ubuntu_vanilla_hadoop_2_6_image_name:-"ubuntu_sahara_vanilla_hadoop_2_6_latest"}
292 disk-image-create $ubuntu_elements_sequence -o $ubuntu_image_name
293 mv $ubuntu_image_name.qcow2 ../
294 fi
287 unset DIB_CLOUD_INIT_DATASOURCES 295 unset DIB_CLOUD_INIT_DATASOURCES
288 fi 296 fi
289 297
@@ -308,6 +316,12 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "vanilla" ]; then
308 disk-image-create $fedora_elements_sequence -o $fedora_image_name 316 disk-image-create $fedora_elements_sequence -o $fedora_image_name
309 mv $fedora_image_name.qcow2 ../ 317 mv $fedora_image_name.qcow2 ../
310 fi 318 fi
319 if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "2.6" ]; then
320 export DIB_HADOOP_VERSION=${DIB_HADOOP_VERSION_2_6:-"2.6.0"}
321 export fedora_image_name=${fedora_vanilla_hadoop_2_6_image_name:-"fedora_sahara_vanilla_hadoop_2_6_latest$suffix"}
322 disk-image-create $fedora_elements_sequence -o $fedora_image_name
323 mv $fedora_image_name.qcow2 ../
324 fi
311 fi 325 fi
312 326
313 # CentOS cloud image: 327 # CentOS cloud image:
@@ -336,6 +350,12 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "vanilla" ]; then
336 disk-image-create $centos_elements_sequence -n -o $centos_image_name 350 disk-image-create $centos_elements_sequence -n -o $centos_image_name
337 mv $centos_image_name.qcow2 ../ 351 mv $centos_image_name.qcow2 ../
338 fi 352 fi
353 if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "2.6" ]; then
354 export DIB_HADOOP_VERSION=${DIB_HADOOP_VERSION_2_6:-"2.6.0"}
355 export centos_image_name=${centos_vanilla_hadoop_2_6_image_name:-"centos_sahara_vanilla_hadoop_2_6_latest$suffix"}
356 disk-image-create $centos_elements_sequence -n -o $centos_image_name
357 mv $centos_image_name.qcow2 ../
358 fi
339 unset BASE_IMAGE_FILE DIB_CLOUD_IMAGES 359 unset BASE_IMAGE_FILE DIB_CLOUD_IMAGES
340 fi 360 fi
341fi 361fi
diff --git a/elements/hadoop/post-install.d/40-setup-hadoop b/elements/hadoop/post-install.d/40-setup-hadoop
index 1755307..68fc93d 100755
--- a/elements/hadoop/post-install.d/40-setup-hadoop
+++ b/elements/hadoop/post-install.d/40-setup-hadoop
@@ -86,6 +86,9 @@ function install_hadoop_v2 {
86 "2.4.1") 86 "2.4.1")
87 hadoop_native_libs_url="${HADOOP_V2_4_NATIVE_LIBS_DOWNLOAD_URL}" 87 hadoop_native_libs_url="${HADOOP_V2_4_NATIVE_LIBS_DOWNLOAD_URL}"
88 ;; 88 ;;
89 "2.6.0")
90 hadoop_native_libs_url="${HADOOP_V2_6_NATIVE_LIBS_DOWNLOAD_URL}"
91 ;;
89 *) 92 *)
90 echo "Invalid DIB_HADOOP_VERSION: $DIB_HADOOP_VERSION" 93 echo "Invalid DIB_HADOOP_VERSION: $DIB_HADOOP_VERSION"
91 exit 1 94 exit 1
diff --git a/elements/oozie/install.d/50-setup-oozie b/elements/oozie/install.d/50-setup-oozie
index d3aaa8a..643bb74 100755
--- a/elements/oozie/install.d/50-setup-oozie
+++ b/elements/oozie/install.d/50-setup-oozie
@@ -15,6 +15,9 @@ elif [[ "$DIB_HADOOP_VERSION" == "2.3.0" ]]; then
15elif [[ "$DIB_HADOOP_VERSION" == "2.4.1" ]]; then 15elif [[ "$DIB_HADOOP_VERSION" == "2.4.1" ]]; then
16 OOZIE_DOWNLOAD_URL="$OOZIE_HADOOP_V2_4_DOWNLOAD_URL" 16 OOZIE_DOWNLOAD_URL="$OOZIE_HADOOP_V2_4_DOWNLOAD_URL"
17 OOZIE_FILE="$OOZIE_HADOOP_V2_4_FILE" 17 OOZIE_FILE="$OOZIE_HADOOP_V2_4_FILE"
18elif [[ "$DIB_HADOOP_VERSION" == "2.6.0" ]]; then
19 OOZIE_DOWNLOAD_URL="$OOZIE_HADOOP_V2_6_DOWNLOAD_URL"
20 OOZIE_FILE="$OOZIE_HADOOP_V2_6_FILE"
18else 21else
19 echo "Unknown Hadoop version selected. Aborting." 22 echo "Unknown Hadoop version selected. Aborting."
20 exit 1 23 exit 1
diff --git a/elements/oozie/root.d/0-check b/elements/oozie/root.d/0-check
index 7cf2e79..7c99afb 100755
--- a/elements/oozie/root.d/0-check
+++ b/elements/oozie/root.d/0-check
@@ -16,6 +16,11 @@ elif [ "$DIB_HADOOP_VERSION" == "2.4.1" ]; then
16 echo "OOZIE_HADOOP_V2_4_FILE and OOZIE_HADOOP_V2_4_DOWNLOAD_URL are not set. Impossible to install Oozie. Exit" 16 echo "OOZIE_HADOOP_V2_4_FILE and OOZIE_HADOOP_V2_4_DOWNLOAD_URL are not set. Impossible to install Oozie. Exit"
17 exit 1 17 exit 1
18 fi 18 fi
19elif [ "$DIB_HADOOP_VERSION" == "2.6.0" ]; then
20 if [ -z "$OOZIE_HADOOP_V2_6_DOWNLOAD_URL" -a -z "$OOZIE_HADOOP_V2_6_FILE" ]; then
21 echo "OOZIE_HADOOP_V2_6_FILE and OOZIE_HADOOP_V2_6_DOWNLOAD_URL are not set. Impossible to install Oozie. Exit"
22 exit 1
23 fi
19else 24else
20 echo "Unknown Hadoop version selected. Aborting" 25 echo "Unknown Hadoop version selected. Aborting"
21 exit 1 26 exit 1