openstack
/
sahara-image-elements
Code Issues Proposed changes

mapr: use disable-firewall only on centos 

The disable-firewall element is specific to centos/fedora, as it refers
to service names available only in centos/fedora.

As mapr can be built on ubuntu as well, remove disable-firewall from
the element-deps (as it makes it always used) and specify it among the
elements used when building a mapr-based image on centos.

Change-Id: Id167b48ad6c97ec141de0f0c17f61d2654ec78ae
This commit is contained in:
Pino Toscano 2015-03-05 12:42:28 +01:00
parent 4556e0ec9c
commit 66860365a6
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -595,7 +595,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "mapr" ]; then
export JAVA_DOWNLOAD_URL=${JAVA_DOWNLOAD_URL:-"http://download.oracle.com/otn-pub/java/jdk/7u51-b13/jdk-7u51-linux-x64.tar.gz"}
mapr_ubuntu_elements_sequence="base vm ssh ubuntu hadoop-mapr"
mapr_centos_elements_sequence="base vm rhel ssh hadoop-mapr redhat-lsb selinux-permissive updater"
mapr_centos_elements_sequence="base vm rhel ssh hadoop-mapr redhat-lsb selinux-permissive updater disable-firewall"
if [ "$DEBUG_MODE" = "true" ]; then
mapr_ubuntu_elements_sequence="$mapr_ubuntu_elements_sequence root-passwd"

1
elements/hadoop-mapr/element-deps
View File

@ -1,3 +1,2 @@
java
mysql
disable-firewall