openstack
/
sahara-image-elements
Code Issues Proposed changes

[HDP2.4] Add ambari 2.2.1.0 element 

New version of HDP plugin uses this element for installing Ambari
- Default ambari version changed to 2.2.1.0

partially implements bp: hdp-24-support

Change-Id: I91ac4c304ffff3d665b2129845a430672aeba782
This commit is contained in:
pratik-gadiya 2016-05-05 11:38:49 +00:00
parent b530b82ea7
commit 70040a060b
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
diskimage-create/README.rst
View File

@ -53,6 +53,13 @@ like this:
tox -e venv -- sahara-image-create -v [2.6|2.7.1|4|5.0|5.3|5.4|5.5]
Also, if you are planning to select which ambari version to target use the
'-v' commandline option like this:
.. sourcecode:: bash
tox -e venv -- sahara-image-create -v [2.2.0.0|2.2.1.0]
6. To select which operating system to target use the '-i' commandline option
like this:

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

@ -29,7 +29,7 @@ usage() {
echo "Usage: $(basename $0)"
echo " [-p vanilla|spark|cloudera|storm|mapr|ambari|plain]"
echo " [-i ubuntu|fedora|centos|centos7]"
echo " [-v 2.6|2.7.1|4|5.0|5.3|5.4|5.5]"
echo " [-v 2.6|2.7.1|4|5.0|5.3|5.4|5.5|2.2.0.0|2.2.1.0]"
echo " [-r 5.0.0|5.1.0]"
echo " [-s 1.3.1|1.6.0]"
echo " [-d]"
@ -241,7 +241,14 @@ case "$PLUGIN" in
exit 1
;;
esac
;;
case "$HADOOP_VERSION" in
"" | "2.2.0.0" | "2.2.1.0");;
*)
echo -e "Continuing image building with custom ambari version \"$HADOOP_VERSION\"\n"
;;
esac
;;
"mapr")
case "$BASE_IMAGE_OS" in
"" | "ubuntu" | "centos");;

4
elements/ambari/README.rst
View File

@ -9,6 +9,6 @@ Environment Variables
AMBARI_VERSION
:Required: No
:Default: 2.0.1
:Default: 2.2.1.0
:Description: Version of Ambari Management Console to install
:Example: ``AMBARI_VERSION="2.0.0"`` installs Ambari 2.0.0
:Example: ``AMBARI_VERSION="2.2.1.0"`` installs Ambari 2.2.1.0

2
elements/ambari/pre-install.d/90-ambari-repo-conf
View File

@ -6,7 +6,7 @@ fi
set -eu
set -o pipefail
DIB_AMBARI_VERSION="${DIB_AMBARI_VERSION:-2.2.0.0}"
DIB_AMBARI_VERSION="${DIB_AMBARI_VERSION:-2.2.1.0}"
case "${DISTRO_NAME}" in
rhel | centos )