Merge "hadoop: add vanilla/2.6 based on CentOS 7"

2015-08-05 05:56:09 +00:00 · 2015-08-05 05:56:09 +00:00 · c03abe2bc0
parent d27c93d832 80998beeda
commit c03abe2bc0
10 changed files with 54 additions and 14 deletions
--- a/diskimage-create/diskimage-create.sh
+++ b/diskimage-create/diskimage-create.sh
@ -134,12 +134,16 @@ case "$PLUGIN" in
            ;;
        esac
        case "$BASE_IMAGE_OS" in
-            "" | "ubuntu" | "fedora" | "centos");;
+            "" | "ubuntu" | "fedora" | "centos" | "centos7");;
            *)
                echo -e "'$BASE_IMAGE_OS' image type is not supported by '$PLUGIN'.\nAborting"
                exit 1
            ;;
        esac
+        if [ "$HADOOP_VERSION" = "1" -a "$BASE_IMAGE_OS" = "centos7" ]; then
+            echo -e "'$BASE_IMAGE_OS' image type is not supported for hadoop version '$HADOOP_VERSION'.\nAborting"
+            exit 1
+        fi
        ;;
    "cloudera")
        case "$BASE_IMAGE_OS" in
@ -372,11 +376,13 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "vanilla" ]; then
    ubuntu_elements_sequence="vm ntp ubuntu hadoop oozie mysql hive $JAVA_ELEMENT"
    fedora_elements_sequence="vm ntp fedora hadoop oozie mysql disable-firewall hive $JAVA_ELEMENT"
    centos_elements_sequence="vm ntp centos hadoop oozie mysql disable-firewall hive $JAVA_ELEMENT"
+    centos7_elements_sequence="vm ntp centos7 hadoop oozie mysql disable-firewall hive $JAVA_ELEMENT"

    if [ "$DEBUG_MODE" = "true" ]; then
        ubuntu_elements_sequence="$ubuntu_elements_sequence root-passwd"
        fedora_elements_sequence="$fedora_elements_sequence root-passwd"
        centos_elements_sequence="$centos_elements_sequence root-passwd"
+        centos7_elements_sequence="$centos7_elements_sequence root-passwd"
    fi

    # Workaround for https://bugs.launchpad.net/diskimage-builder/+bug/1204824
@ -389,6 +395,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "vanilla" ]; then
        echo "**************************************************************"
        fedora_elements_sequence="$fedora_elements_sequence selinux-permissive"
        centos_elements_sequence="$centos_elements_sequence selinux-permissive"
+        centos7_elements_sequence="$centos7_elements_sequence selinux-permissive"
        suffix=".selinux-permissive"
    fi

@ -396,6 +403,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "vanilla" ]; then
        [ -n "$UBUNTU_MIRROR" ] && ubuntu_elements_sequence="$ubuntu_elements_sequence apt-mirror"
        [ -n "$FEDORA_MIRROR" ] && fedora_elements_sequence="$fedora_elements_sequence fedora-mirror"
        [ -n "$CENTOS_MIRROR" ] && centos_elements_sequence="$centos_elements_sequence centos-mirror"
+        [ -n "$CENTOS_MIRROR" ] && centos7_elements_sequence="$centos7_elements_sequence centos-mirror"
    fi

    # Ubuntu cloud image
@ -451,6 +459,15 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "vanilla" ]; then
        fi
        unset BASE_IMAGE_FILE DIB_CLOUD_IMAGES
    fi
+
+    # CentOS 7 cloud image
+    if [ -z "$BASE_IMAGE_OS" -o "$BASE_IMAGE_OS" = "centos7" ]; then
+        if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "2.6" ]; then
+            export DIB_HADOOP_VERSION=${DIB_HADOOP_VERSION_2_6:-"2.6.0"}
+            export centos7_image_name=${centos7_vanilla_hadoop_2_6_image_name:-"centos7_sahara_vanilla_hadoop_2_6_latest$suffix"}
+            disk-image-create $TRACING $centos7_elements_sequence -o $centos7_image_name
+        fi
+    fi
 fi

 ##########################
--- a/elements/disable-firewall/post-install.d/31-disable-ip6tables
+++ b/elements/disable-firewall/post-install.d/31-disable-ip6tables
@ -6,9 +6,11 @@ fi
 set -eu
 set -o pipefail

-if [ "$DISTRO_NAME" = "fedora" ]; then
-    install-packages iptables-services
-fi
+case "$DISTRO_NAME" in
+    fedora | centos7 )
+        install-packages iptables-services
+        ;;
+esac

 case "${DISTRO_NAME}" in
    fedora | centos | rhel )
--- a/elements/disable-firewall/post-install.d/32-disable-iptables
+++ b/elements/disable-firewall/post-install.d/32-disable-iptables
@ -6,9 +6,11 @@ fi
 set -eu
 set -o pipefail

-if [ "$DISTRO_NAME" = "fedora" ]; then
-    install-packages iptables-services
-fi
+case "$DISTRO_NAME" in
+    fedora | centos7 )
+        install-packages iptables-services
+        ;;
+esac

 case "${DISTRO_NAME}" in
    fedora | centos | rhel )
--- a/elements/hadoop/post-install.d/40-setup-hadoop
+++ b/elements/hadoop/post-install.d/40-setup-hadoop
@ -117,7 +117,7 @@ EOF
 }

 case "$DISTRO_NAME" in
-    fedora | ubuntu | rhel | centos )
+    fedora | ubuntu | rhel | centos | centos7 )
    ;;
    *)
        echo "Unknown distro: $DISTRO_NAME. Exiting."
@ -135,7 +135,7 @@ case "$DISTRO_NAME" in
        adduser --ingroup hadoop --disabled-password --gecos GECOS hadoop
        adduser hadoop sudo
    ;;
-    fedora | rhel | centos )
+    fedora | rhel | centos | centos7 )
        adduser -G adm,wheel hadoop
    ;;
 esac
--- a/elements/hadoop/root.d/50-download-hadoop
+++ b/elements/hadoop/root.d/50-download-hadoop
@ -32,7 +32,7 @@ function download_hadoop_v2 {
 }

 case "$DISTRO_NAME" in
-    fedora | ubuntu | rhel | centos )
+    fedora | ubuntu | rhel | centos | centos7 )
    ;;
    *)
        echo "Unknown distro: $DISTRO_NAME. Exiting."
--- a/elements/java/bin/setup-java-home
+++ b/elements/java/bin/setup-java-home
@ -32,7 +32,7 @@ case "$DISTRO_NAME" in
        update-alternatives --set java $JRE_HOME/bin/java
        update-alternatives --set javac $JDK_HOME/bin/javac
    ;;
-    fedora | rhel | centos )
+    fedora | rhel | centos | centos7 )
        alternatives --install /usr/bin/java java $JRE_HOME/bin/java 200000
        alternatives --install /usr/bin/javac javac $JDK_HOME/bin/javac 200000
    ;;
--- a/elements/mysql/install.d/10-mysql
+++ b/elements/mysql/install.d/10-mysql
@ -7,7 +7,7 @@ set -eu
 set -o pipefail

 case "$DISTRO_NAME" in
-    fedora | rhel | centos )
+    fedora | rhel | centos | centos7 )
        mkdir -p /etc/mysql/conf.d
    ;;
 esac
--- a/elements/mysql/install.d/start-mysql.sh
+++ b/elements/mysql/install.d/start-mysql.sh
@ -13,7 +13,17 @@ case "$DISTRO" in
    Ubuntu )
        sudo service mysql start
        ;;
-    Fedora | CentOS | RedHatEnterpriseServer )
+    Fedora | RedHatEnterpriseServer )
        sudo service mysqld start
        ;;
+    CentOS )
+        case "$(lsb_release -rs)" in
+            7.*)
+                sudo service mariadb start
+                ;;
+            6.*)
+                sudo service mysqld start
+                ;;
+        esac
+        ;;
 esac
--- a/elements/mysql/pkg-map
+++ b/elements/mysql/pkg-map
@ -5,6 +5,12 @@
      "mysql_libs_package": "community-mysql-libs",
      "mysql_server_package": "community-mysql-server",
      "mysql_java_package": "mysql-connector-java"
+    },
+    "centos7": {
+      "mysql_package": "mariadb",
+      "mysql_libs_package": "mariadb-libs",
+      "mysql_server_package": "mariadb-server",
+      "mysql_java_package": "mysql-connector-java"
    }
  },
  "family": {
--- a/elements/openjdk/install.d/33-java
+++ b/elements/openjdk/install.d/33-java
@ -20,6 +20,9 @@ default_jdk_version_for_distro () {
                echo "7"
            fi
        ;;
+        centos7 )
+            echo "8"
+        ;;
        *)
            echo "Unknown OpenJDK distro: $DISTRO_NAME" >&2
            exit 1
@ -38,7 +41,7 @@ case "$DISTRO_NAME" in
        JDK_PATH=$(update-alternatives --list javac)
        JDK_HOME=${JDK_PATH%/bin/javac}
    ;;
-    fedora | rhel | centos )
+    fedora | rhel | centos | centos7 )
        # NOTE: rpm -E "%{java_home}" command returns wrong java home
        # on CentOS, Fedora and RHEL
        JRE_HOME="/usr/lib/jvm/java-openjdk"