openstack
/
sahara-image-elements
Code Issues Proposed changes

Merge "Remove support for building unsupported MapR versions"

This commit is contained in:
Jenkins 2016-03-02 07:31:01 +00:00 committed by Gerrit Code Review
parent 2fa7f1ea55 e99db2f051
commit b8c1d80d43
6 changed files with 7 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,7 @@ usage() {
echo " [-p vanilla|spark|hdp|cloudera|storm|mapr|ambari|plain]"
echo " [-i ubuntu|fedora|centos|centos7]"
echo " [-v 2|2.6|2.7.1|4|5.0|5.3|5.4|5.5]"
echo " [-r 3.1.1|4.0.1|4.0.2|5.0.0]"
echo " [-r 5.0.0]"
echo " [-s 1.3.1|1.6.0]"
echo " [-d]"
echo " [-u]"
@ -269,7 +269,7 @@ case "$PLUGIN" in
echo "${DIB_DEFAULT_MAPR_VERSION} version would be used"
DIB_MAPR_VERSION=${DIB_DEFAULT_MAPR_VERSION}
;;
"3.1.1" | "4.0.1" | "4.0.2" | "5.0.0");;
"5.0.0");;
*)
echo -e "Unknown MapR version.\nExit"
exit 1

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

@ -13,7 +13,7 @@ following syntax to select the ``MapR`` plugin:
.. sourcecode:: bash
diskimage-create.sh -p mapr [-i ubuntu|centos] [-r 3.1.1|4.0.1|4.0.2]
diskimage-create.sh -p mapr [-i ubuntu|centos] [-r 5.0.0]
In order to speed up image creation process you can download archives with MapR
repositories and specify environment variables:
@ -24,11 +24,11 @@ For example:
.. sourcecode:: bash
export DIB_MAPR_CORE_DEB_REPO="file://<path-to-archive>/mapr-v4.0.1GA.deb.tgz"
export DIB_MAPR_CORE_RPM_REPO="file://<path-to-archive>/mapr-v4.0.1GA.rpm.tgz"
export DIB_MAPR_CORE_DEB_REPO="file://<path-to-archive>/mapr-v5.0.0GA.deb.tgz"
export DIB_MAPR_CORE_RPM_REPO="file://<path-to-archive>/mapr-v5.0.0GA.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"
diskimage-create.sh -p mapr -r 4.0.1
diskimage-create.sh -p mapr -r 5.0.0
Environment Variables
---------------------
@ -36,4 +36,4 @@ Environment Variables
DIB_MAPR_VERSION
:Required: Yes
:Description: Version of MapR to install.
:Example: ``DIB_MAPR_VERSION=4.0.1``
:Example: ``DIB_MAPR_VERSION=5.0.0``

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

@ -17,24 +17,12 @@ get_repo_url() {
if [ "$DISTRO_NAME" = "ubuntu" ]; then
case "$DIB_MAPR_VERSION" in
"3.1.1")
repo_url="${DIB_MAPR_ECO_DEB_REPO:-http://package.mapr.com/releases/ecosystem/ubuntu binary/}"
;;
"4.0.1" | "4.0.2")
repo_url="${DIB_MAPR_ECO_DEB_REPO:-http://package.mapr.com/releases/ecosystem-4.x/ubuntu binary/}"
;;
"5.0.0")
repo_url="${DIB_MAPR_ECO_DEB_REPO:-http://package.mapr.com/releases/ecosystem-5.x/ubuntu binary/}"
;;
esac
elif [ "$DISTRO_NAME" = "centos" -o "$DISTRO_NAME" = "rhel" ]; then
case "$DIB_MAPR_VERSION" in
"3.1.1")
repo_url="${DIB_MAPR_ECO_RPM_REPO:-http://package.mapr.com/releases/ecosystem/redhat}"
;;
"4.0.1" | "4.0.2")
repo_url="${DIB_MAPR_ECO_RPM_REPO:-http://package.mapr.com/releases/ecosystem-4.x/redhat}"
;;
"5.0.0")
repo_url="${DIB_MAPR_ECO_RPM_REPO:-http://package.mapr.com/releases/ecosystem-5.x/redhat}"
;;

36
elements/hadoop-mapr/resources/spec_3.1.1.json
View File

@ -1,36 +0,0 @@
{
"drill": [
"0.7.0",
"1.2.0"
],
"flume": [
"1.5.0"
],
"hbase": [
"0.94.24"
],
"hive": [
"0.13"
],
"httpfs": [
"1.0"
],
"hue": [
"3.6.0"
],
"impala": [
"1.2.3"
],
"mahout": [
"0.9"
],
"oozie": [
"4.0.1"
],
"pig": [
"0.13"
],
"sqoop": [
"2.0.0"
]
}

40
elements/hadoop-mapr/resources/spec_4.0.1.json
View File

@ -1,40 +0,0 @@
{
"drill": [
"0.7.0",
"1.2.0"
],
"flume": [
"1.5.0"
],
"hbase": [
"0.94.24",
"0.98.7"
],
"hive": [
"0.13"
],
"httpfs": [
"1.0"
],
"hue": [
"3.6.0"
],
"impala": [
"1.2.3"
],
"mahout": [
"0.9"
],
"oozie": [
"4.0.1"
],
"pig": [
"0.13"
],
"spark": [
"1.1.0"
],
"sqoop": [
"2.0.0"
]
}

36
elements/hadoop-mapr/resources/spec_4.0.2.json
View File

@ -1,36 +0,0 @@
{
"drill": [
"0.7.0",
"1.2.0"
],
"flume": [
"1.5.0"
],
"hbase": [
"0.98.7"
],
"hive": [
"0.13"
],
"httpfs": [
"1.0"
],
"hue": [
"3.6.0"
],
"impala": [
"1.4.1"
],
"mahout": [
"0.9"
],
"oozie": [
"4.0.1"
],
"pig": [
"0.13"
],
"sqoop": [
"2.0.0"
]
}