summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgroghkov <groghkov@maprtech.com>2016-03-01 19:57:03 +0200
committerEvgeny Sikachev <esikachev@mirantis.com>2016-03-03 11:46:18 +0000
commit21162980ac758db35e05475600bcdfd3d4e556a7 (patch)
treec0731d18d7c04f8fe8c223e447e5897c535d86d1
parentb8c1d80d43109409c4563d17620409f9d7e38f1d (diff)
Add support of building images for MapR 5.1.04.0.0.0rc1
Notes
Notes (review): Code-Review+2: Vitaly Gridnev <vgridnev@mirantis.com> Verified-1: Sahara Hadoop Cluster CI <elastic-hadoop-ci@mirantis.com> Code-Review+2: Trevor McKay <tmckay@redhat.com> Code-Review+1: lu huichun <huichun.lu@intel.com> Workflow+1: Vitaly Gridnev <vgridnev@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 15 Mar 2016 12:58:10 +0000 Reviewed-on: https://review.openstack.org/286756 Project: openstack/sahara-image-elements Branch: refs/heads/master
-rwxr-xr-xdiskimage-create/diskimage-create.sh6
-rw-r--r--elements/hadoop-mapr/README.rst10
-rwxr-xr-xelements/hadoop-mapr/install.d/44-mapr-eco-repository4
-rw-r--r--elements/hadoop-mapr/resources/spec_5.1.0.json47
4 files changed, 57 insertions, 10 deletions
diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh
index 0325c82..b2b5f07 100755
--- a/diskimage-create/diskimage-create.sh
+++ b/diskimage-create/diskimage-create.sh
@@ -10,7 +10,7 @@ unset DIB_IMAGE_SIZE
10DEBUG_MODE="false" 10DEBUG_MODE="false"
11 11
12# The default version for a MapR plugin 12# The default version for a MapR plugin
13DIB_DEFAULT_MAPR_VERSION="5.0.0" 13DIB_DEFAULT_MAPR_VERSION="5.1.0"
14 14
15# The default version for Spark plugin 15# The default version for Spark plugin
16DIB_DEFAULT_SPARK_VERSION="1.6.0" 16DIB_DEFAULT_SPARK_VERSION="1.6.0"
@@ -30,7 +30,7 @@ usage() {
30 echo " [-p vanilla|spark|hdp|cloudera|storm|mapr|ambari|plain]" 30 echo " [-p vanilla|spark|hdp|cloudera|storm|mapr|ambari|plain]"
31 echo " [-i ubuntu|fedora|centos|centos7]" 31 echo " [-i ubuntu|fedora|centos|centos7]"
32 echo " [-v 2|2.6|2.7.1|4|5.0|5.3|5.4|5.5]" 32 echo " [-v 2|2.6|2.7.1|4|5.0|5.3|5.4|5.5]"
33 echo " [-r 5.0.0]" 33 echo " [-r 5.0.0|5.1.0]"
34 echo " [-s 1.3.1|1.6.0]" 34 echo " [-s 1.3.1|1.6.0]"
35 echo " [-d]" 35 echo " [-d]"
36 echo " [-u]" 36 echo " [-u]"
@@ -269,7 +269,7 @@ case "$PLUGIN" in
269 echo "${DIB_DEFAULT_MAPR_VERSION} version would be used" 269 echo "${DIB_DEFAULT_MAPR_VERSION} version would be used"
270 DIB_MAPR_VERSION=${DIB_DEFAULT_MAPR_VERSION} 270 DIB_MAPR_VERSION=${DIB_DEFAULT_MAPR_VERSION}
271 ;; 271 ;;
272 "5.0.0");; 272 "5.0.0" | "5.1.0");;
273 *) 273 *)
274 echo -e "Unknown MapR version.\nExit" 274 echo -e "Unknown MapR version.\nExit"
275 exit 1 275 exit 1
diff --git a/elements/hadoop-mapr/README.rst b/elements/hadoop-mapr/README.rst
index 97653f3..eb8110f 100644
--- a/elements/hadoop-mapr/README.rst
+++ b/elements/hadoop-mapr/README.rst
@@ -13,7 +13,7 @@ following syntax to select the ``MapR`` plugin:
13 13
14.. sourcecode:: bash 14.. sourcecode:: bash
15 15
16 diskimage-create.sh -p mapr [-i ubuntu|centos] [-r 5.0.0] 16 diskimage-create.sh -p mapr [-i ubuntu|centos] [-r 5.0.0 | 5.1.0]
17 17
18In order to speed up image creation process you can download archives with MapR 18In order to speed up image creation process you can download archives with MapR
19repositories and specify environment variables: 19repositories and specify environment variables:
@@ -24,11 +24,11 @@ For example:
24 24
25.. sourcecode:: bash 25.. sourcecode:: bash
26 26
27 export DIB_MAPR_CORE_DEB_REPO="file://<path-to-archive>/mapr-v5.0.0GA.deb.tgz" 27 export DIB_MAPR_CORE_DEB_REPO="file://<path-to-archive>/mapr-v5.1.0GA.deb.tgz"
28 export DIB_MAPR_CORE_RPM_REPO="file://<path-to-archive>/mapr-v5.0.0GA.rpm.tgz" 28 export DIB_MAPR_CORE_RPM_REPO="file://<path-to-archive>/mapr-v5.1.0GA.rpm.tgz"
29 export DIB_MAPR_ECO_DEB_REPO="http://<URL>/mapr-ecosystem.deb.tgz" 29 export DIB_MAPR_ECO_DEB_REPO="http://<URL>/mapr-ecosystem.deb.tgz"
30 export DIB_MAPR_ECO_RPM_REPO="http://<URL>/mapr-ecosystem.rpm.tgz" 30 export DIB_MAPR_ECO_RPM_REPO="http://<URL>/mapr-ecosystem.rpm.tgz"
31 diskimage-create.sh -p mapr -r 5.0.0 31 diskimage-create.sh -p mapr -r 5.1.0
32 32
33Environment Variables 33Environment Variables
34--------------------- 34---------------------
@@ -36,4 +36,4 @@ Environment Variables
36DIB_MAPR_VERSION 36DIB_MAPR_VERSION
37 :Required: Yes 37 :Required: Yes
38 :Description: Version of MapR to install. 38 :Description: Version of MapR to install.
39 :Example: ``DIB_MAPR_VERSION=5.0.0`` 39 :Example: ``DIB_MAPR_VERSION=5.1.0``
diff --git a/elements/hadoop-mapr/install.d/44-mapr-eco-repository b/elements/hadoop-mapr/install.d/44-mapr-eco-repository
index 5c31739..d1a6da0 100755
--- a/elements/hadoop-mapr/install.d/44-mapr-eco-repository
+++ b/elements/hadoop-mapr/install.d/44-mapr-eco-repository
@@ -17,13 +17,13 @@ get_repo_url() {
17 17
18 if [ "$DISTRO_NAME" = "ubuntu" ]; then 18 if [ "$DISTRO_NAME" = "ubuntu" ]; then
19 case "$DIB_MAPR_VERSION" in 19 case "$DIB_MAPR_VERSION" in
20 "5.0.0") 20 "5.0.0"|"5.1.0")
21 repo_url="${DIB_MAPR_ECO_DEB_REPO:-http://package.mapr.com/releases/ecosystem-5.x/ubuntu binary/}" 21 repo_url="${DIB_MAPR_ECO_DEB_REPO:-http://package.mapr.com/releases/ecosystem-5.x/ubuntu binary/}"
22 ;; 22 ;;
23 esac 23 esac
24 elif [ "$DISTRO_NAME" = "centos" -o "$DISTRO_NAME" = "rhel" ]; then 24 elif [ "$DISTRO_NAME" = "centos" -o "$DISTRO_NAME" = "rhel" ]; then
25 case "$DIB_MAPR_VERSION" in 25 case "$DIB_MAPR_VERSION" in
26 "5.0.0") 26 "5.0.0"|"5.1.0")
27 repo_url="${DIB_MAPR_ECO_RPM_REPO:-http://package.mapr.com/releases/ecosystem-5.x/redhat}" 27 repo_url="${DIB_MAPR_ECO_RPM_REPO:-http://package.mapr.com/releases/ecosystem-5.x/redhat}"
28 ;; 28 ;;
29 esac 29 esac
diff --git a/elements/hadoop-mapr/resources/spec_5.1.0.json b/elements/hadoop-mapr/resources/spec_5.1.0.json
new file mode 100644
index 0000000..d70d2a4
--- /dev/null
+++ b/elements/hadoop-mapr/resources/spec_5.1.0.json
@@ -0,0 +1,47 @@
1{
2 "drill": [
3 "1.1.0",
4 "1.2.0",
5 "1.4.0"
6 ],
7 "flume": [
8 "1.5.0",
9 "1.6.0"
10 ],
11 "hbase": [
12 "0.98.9",
13 "0.98.12"
14 ],
15 "hive": [
16 "0.13",
17 "1.0",
18 "1.2"
19 ],
20 "httpfs": [
21 "1.0"
22 ],
23 "hue": [
24 "3.7.0",
25 "3.8.1",
26 "3.9.0"
27 ],
28 "impala": [
29 "1.4.1"
30 ],
31 "mahout": [
32 "0.10.0"
33 ],
34 "oozie": [
35 "4.2.0"
36 ],
37 "pig": [
38 "0.14",
39 "0.15"
40 ],
41 "sqoop": [
42 "2.0.0"
43 ],
44 "spark": [
45 "1.5.2"
46 ]
47} \ No newline at end of file