openstack
/
sahara-image-elements
Code Issues Proposed changes

Add MapR 4.0.2 support 

Added ability to build prepared images for MapR 4.0.2

Change-Id: Iceadfc00bd61d5ad3215392ecb618e2661f11693
Closes-Bug: #1439179
This commit is contained in:
Artem Osadchyi 2015-03-31 19:24:39 +03:00
parent 742f5dc492
commit 12167c7dbb
5 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,7 @@ DEFAULT_DIB_UTILS_REPO_BRANCH="0.0.9"
DEFAULT_DIB_REPO_BRANCH="0.1.41"
# The default version for a MapR plugin
DIB_DEFAULT_MAPR_VERSION="4.0.1"
DIB_DEFAULT_MAPR_VERSION="4.0.2"
# Default list of datasource modules for ubuntu. Workaround for bug #1375645
export CLOUD_INIT_DATASOURCES=${DIB_CLOUD_INIT_DATASOURCES:-"NoCloud, ConfigDrive, OVF, MAAS, Ec2"}
@ -27,7 +27,7 @@ usage() {
echo " [-p vanilla|spark|hdp|cloudera|storm|mapr]"
echo " [-i ubuntu|fedora|centos]"
echo " [-v 1|2|2.6|5.0|5.3|plain]"
echo " [-r 3.1.1|4.0.1]"
echo " [-r 3.1.1|4.0.1|4.0.2]"
echo " [-d]"
echo " [-m]"
echo " [-u]"
@ -146,34 +146,36 @@ if [ -n "$HADOOP_VERSION" -a "$HADOOP_VERSION" != "1" -a "$HADOOP_VERSION" != "2
fi
if [ "$PLUGIN" = "vanilla" -a "$HADOOP_VERSION" = "plain" ]; then
echo "Impossible combination.\nAborting"
echo -e "Impossible combination.\nAborting"
exit 1
fi
if [ "$PLUGIN" = "cloudera" -a "$BASE_IMAGE_OS" = "fedora" ]; then
echo "Impossible combination.\nAborting"
echo -e "Impossible combination.\nAborting"
exit 1
fi
if [ "$PLUGIN" = "mapr" -a "$BASE_IMAGE_OS" = "fedora" ]; then
echo "'fedora' image type is not supported by 'mapr' plugin.\nAborting"
echo -e "'fedora' image type is not supported by 'mapr' plugin.\nAborting"
exit 1
fi
if [ "$PLUGIN" != "mapr" -a -n "$DIB_MAPR_VERSION" ]; then
echo "'-r' parameter should be used only with 'mapr' plugin.\nAborting"
echo -e "'-r' parameter should be used only with 'mapr' plugin.\nAborting"
exit 1
fi
if [ "$PLUGIN" = "mapr" -a -z "$DIB_MAPR_VERSION" ]; then
echo "MapR version is not specified.\n"
echo "${DIB_DEFAULT_MAPR_VERSION} version would be used.\n"
echo "MapR version is not specified"
echo "${DIB_DEFAULT_MAPR_VERSION} version would be used"
DIB_MAPR_VERSION=${DIB_DEFAULT_MAPR_VERSION}
fi
if [ "$PLUGIN" = "mapr" -a "${DIB_MAPR_VERSION}" != "3.1.1" -a "${DIB_MAPR_VERSION}" != "4.0.1" ]; then
echo "Unknown MapR version.\nExit"
exit 1
if [ "$PLUGIN" = "mapr" ]; then
case "$DIB_MAPR_VERSION" in
"3.1.1" | "4.0.1" | "4.0.2") ;;
*) echo -e "Unknown MapR version.\nExit"; exit 1 ;;
esac
fi
if [ "$JAVA_ELEMENT" != "openjdk" -a "$JAVA_ELEMENT" != "oracle-java" ]; then
@ -630,7 +632,7 @@ fi
##########################
if [ -z "$PLUGIN" -o "$PLUGIN" = "mapr" ]; then
echo "For mapr plugin option -v is ignored"
export DIB_MAPR_VERSION=${DIB_MAPR_VERSION:-4.0.1}
export DIB_MAPR_VERSION=${DIB_MAPR_VERSION:-${DIB_DEFAULT_MAPR_VERSION}}
export DIB_CLOUD_INIT_DATASOURCES=$CLOUD_INIT_DATASOURCES

4
elements/hadoop-mapr/README.rst
View File

@ -4,7 +4,7 @@ Installs `OpenJDK <http://http://openjdk.java.net/>`_ and `Scala <http://www.sca
In order to create the MapR images with the diskimage-create.sh script, use the following syntax to select the "MapR" plugin:
.. sourcecode:: bash
sudo bash diskimage-create.sh -p mapr [-i ubuntu|centos] [-r 3.1.1|4.0.1]
bash diskimage-create.sh -p mapr [-i ubuntu|centos] [-r 3.1.1|4.0.1|4.0.2]
NOTE: By default MapR 4.0.1 version will be used
@ -18,4 +18,4 @@ For example:
export DIB_MAPR_CORE_RPM_REPO="file://<path-to-archive>/mapr-v4.0.1GA.rpm.tgz"
export DIB_MAPR_ECO_DEB_REPO="http://<URL>/mapr-ecosystem.deb.tgz"
export DIB_MAPR_ECO_RPM_REPO="http://<URL>/mapr-ecosystem.rpm.tgz"
sudo -E bash diskimage-create.sh -p mapr -r 4.0.1
bash diskimage-create.sh -p mapr -r 4.0.1

2
elements/hadoop-mapr/install.d/40-mapr-dependencies
View File

@ -150,6 +150,8 @@ elif [ "$DISTRO_NAME" = "centos" -o "$DISTRO_NAME" = "rhel" ]; then
urw-fonts \
xml-common \
zip
rpm -Uvh ftp://rpmfind.net/linux/centos/6.6/os/x86_64/Packages/libevent-1.4.13-4.el6.x86_64.rpm
fi
if [ "$?" != "0" ]; then

2
elements/hadoop-mapr/install.d/41-scala
View File

@ -8,7 +8,7 @@ set -eu
echo "START: installing Scala"
#Current available version
DEF_VERSION="2.11.2"
DEF_VERSION="2.11.6"
RETURN_CODE="$(curl -s -o /dev/null -w "%{http_code}" http://www.scala-lang.org/)"

26
elements/hadoop-mapr/install.d/44-mapr-eco-repository
View File

@ -13,17 +13,23 @@ RPM_REPO=${DIB_MAPR_ECO_RPM_REPO:-}
DEB_REPO=${DIB_MAPR_ECO_DEB_REPO:-}
if [ "$DISTRO_NAME" = "ubuntu" ]; then
if [ "$DIB_MAPR_VERSION" = "3.1.1" ]; then
MAPR_REPO_URL=${DIB_MAPR_ECO_DEB_REPO:-"http://package.mapr.com/releases/ecosystem/ubuntu/"}
elif [ "$DIB_MAPR_VERSION" = "4.0.1" ]; then
MAPR_REPO_URL=${DIB_MAPR_ECO_DEB_REPO:-"http://package.mapr.com/releases/ecosystem-4.x/ubuntu/"}
fi
case "$DIB_MAPR_VERSION" in
"3.1.1")
MAPR_REPO_URL=${DIB_MAPR_ECO_DEB_REPO:-"http://package.mapr.com/releases/ecosystem/ubuntu/"}
;;
"4.0.1" | "4.0.2")
MAPR_REPO_URL=${DIB_MAPR_ECO_DEB_REPO:-"http://package.mapr.com/releases/ecosystem-4.x/ubuntu/"}
;;
esac
elif [ "$DISTRO_NAME" = "centos" -o "$DISTRO_NAME" = "rhel" ]; then
if [ "$DIB_MAPR_VERSION" = "3.1.1" ]; then
MAPR_REPO_URL=${DIB_MAPR_ECO_RPM_REPO:-"http://package.mapr.com/releases/ecosystem/redhat/"}
elif [ "$DIB_MAPR_VERSION" = "4.0.1" ]; then
MAPR_REPO_URL=${DIB_MAPR_ECO_RPM_REPO:-"http://package.mapr.com/releases/ecosystem-4.x/redhat/"}
fi
case "$DIB_MAPR_VERSION" in
"3.1.1")
MAPR_REPO_URL=${DIB_MAPR_ECO_RPM_REPO:-"http://package.mapr.com/releases/ecosystem/redhat/"}
;;
"4.0.1" | "4.0.2")
MAPR_REPO_URL=${DIB_MAPR_ECO_RPM_REPO:-"http://package.mapr.com/releases/ecosystem-4.x/redhat/"}
;;
esac
else
echo "Unknown distribution"
exit 1