From 01ec2c548713759f51ffd777986295e2c1e29e63 Mon Sep 17 00:00:00 2001 From: Sergey Reshetnyak Date: Mon, 17 Aug 2015 19:02:51 +0300 Subject: [PATCH] Install xfsprogs for ability to formatting volumes in XFS FS xfsprogs provides mkfs.xfs util for formatting volumes in XFS file system. Change-Id: Ief9317f25db09a68d4d903b264d6ec0b0336a4bc Closes-bug: #1484924 --- diskimage-create/diskimage-create.sh | 34 ++++++++++++------------ elements/xfs-tools/README.rst | 5 ++++ elements/xfs-tools/package-installs.yaml | 1 + 3 files changed, 23 insertions(+), 17 deletions(-) create mode 100644 elements/xfs-tools/README.rst create mode 100644 elements/xfs-tools/package-installs.yaml diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh index f1b28aab..bff184f8 100755 --- a/diskimage-create/diskimage-create.sh +++ b/diskimage-create/diskimage-create.sh @@ -375,10 +375,10 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "vanilla" ]; then export HADOOP_V2_7_1_NATIVE_LIBS_DOWNLOAD_URL=${HADOOP_V2_7_1_NATIVE_LIBS_DOWNLOAD_URL:-"http://sahara-files.mirantis.com/hadoop-native-libs-2.7.1.tar.gz"} export OOZIE_HADOOP_V2_7_1_DOWNLOAD_URL=${OOZIE_HADOOP_V2_7_1_FILE:-"http://sahara-files.mirantis.com/oozie-4.2.0-hadoop-2.7.1.tar.gz"} - 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" + ubuntu_elements_sequence="vm ntp ubuntu hadoop oozie mysql hive xfs-tools $JAVA_ELEMENT" + fedora_elements_sequence="vm ntp fedora hadoop oozie mysql disable-firewall hive xfs-tools $JAVA_ELEMENT" + centos_elements_sequence="vm ntp centos hadoop oozie mysql disable-firewall hive xfs-tools $JAVA_ELEMENT" + centos7_elements_sequence="vm ntp centos7 hadoop oozie mysql disable-firewall hive xfs-tools $JAVA_ELEMENT" if [ "$DEBUG_MODE" = "true" ]; then ubuntu_elements_sequence="$ubuntu_elements_sequence root-passwd" @@ -501,7 +501,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "spark" ]; then export DIB_CLOUD_INIT_DATASOURCES=$CLOUD_INIT_DATASOURCES export DIB_SPARK_VERSION - COMMON_ELEMENTS="vm ntp ubuntu $JAVA_ELEMENT swift_hadoop spark" + COMMON_ELEMENTS="vm ntp ubuntu xfs-tools $JAVA_ELEMENT swift_hadoop spark" if [ "$DIB_SPARK_VERSION" == "1.0.2" ]; then echo "Overriding CDH version, CDH 4 is required for this Spark version" export DIB_CDH_VERSION="CDH4" @@ -541,7 +541,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "storm" ]; then export DIB_STORM_VERSION=${DIB_STORM_VERSION:-0.9.2} export ubuntu_image_name=${ubuntu_storm_image_name:-"ubuntu_sahara_storm_latest_$DIB_STORM_VERSION"} - ubuntu_elements_sequence="vm ntp ubuntu $JAVA_ELEMENT zookeeper storm" + ubuntu_elements_sequence="vm ntp ubuntu xfs-tools $JAVA_ELEMENT zookeeper storm" if [ -n "$USE_MIRRORS" ]; then [ -n "$UBUNTU_MIRROR" ] && ubuntu_elements_sequence="$ubuntu_elements_sequence apt-mirror" @@ -573,7 +573,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "hdp" ]; then if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "1" ]; then export centos_image_name_hdp_1_3=${centos_hdp_hadoop_1_image_name:-"centos-6_6-64-hdp-1-3"} # Elements to include in an HDP-based image - centos_elements_sequence="vm ntp centos hadoop-hdp yum $JAVA_ELEMENT" + centos_elements_sequence="vm ntp centos hadoop-hdp yum xfs-tools $JAVA_ELEMENT" if [ "$DEBUG_MODE" = "true" ]; then # enable the root-pwd element, for simpler local debugging of images centos_elements_sequence=$centos_elements_sequence" root-passwd" @@ -591,7 +591,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "hdp" ]; then if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "2" ]; then export centos_image_name_hdp_2_0=${centos_hdp_hadoop_2_image_name:-"centos-6_6-64-hdp-2-0"} # Elements to include in an HDP-based image - centos_elements_sequence="vm ntp centos hadoop-hdp yum $JAVA_ELEMENT" + centos_elements_sequence="vm ntp centos hadoop-hdp yum xfs-tools $JAVA_ELEMENT" if [ "$DEBUG_MODE" = "true" ]; then # enable the root-pwd element, for simpler local debugging of images centos_elements_sequence=$centos_elements_sequence" root-passwd" @@ -619,7 +619,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "cloudera" ]; then if [ -z "$BASE_IMAGE_OS" -o "$BASE_IMAGE_OS" = "ubuntu" ]; then if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "5.0" ]; then cloudera_5_0_ubuntu_image_name=${cloudera_5_0_ubuntu_image_name:-ubuntu_sahara_cloudera_5_0_0} - cloudera_elements_sequence="vm ntp ubuntu hadoop-cloudera" + cloudera_elements_sequence="vm ntp ubuntu hadoop-cloudera xfs-tools" if [ -n "$USE_MIRRORS" ]; then [ -n "$UBUNTU_MIRROR" ] && ubuntu_elements_sequence="$ubuntu_elements_sequence apt-mirror" @@ -633,7 +633,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "cloudera" ]; then fi if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "5.3" ]; then cloudera_5_3_ubuntu_image_name=${cloudera_5_3_ubuntu_image_name:-ubuntu_sahara_cloudera_5_3_0} - cloudera_elements_sequence="vm ntp ubuntu hadoop-cloudera" + cloudera_elements_sequence="vm ntp ubuntu hadoop-cloudera xfs-tools" if [ -n "$USE_MIRRORS" ]; then [ -n "$UBUNTU_MIRROR" ] && ubuntu_elements_sequence="$ubuntu_elements_sequence apt-mirror" @@ -647,7 +647,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "cloudera" ]; then fi if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "5.4" ]; then cloudera_5_4_ubuntu_image_name=${cloudera_5_4_ubuntu_image_name:-ubuntu_sahara_cloudera_5_4_0} - cloudera_elements_sequence="vm ntp ubuntu hadoop-cloudera" + cloudera_elements_sequence="vm ntp ubuntu hadoop-cloudera xfs-tools" if [ -n "$USE_MIRRORS" ]; then [ -n "$UBUNTU_MIRROR" ] && ubuntu_elements_sequence="$ubuntu_elements_sequence apt-mirror" @@ -671,7 +671,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "cloudera" ]; then export DIB_CDH_VERSION="5.0" cloudera_5_0_centos_image_name=${cloudera_5_0_centos_image_name:-centos_sahara_cloudera_5_0_0} - cloudera_elements_sequence="vm ntp centos hadoop-cloudera selinux-permissive disable-firewall" + cloudera_elements_sequence="vm ntp centos hadoop-cloudera selinux-permissive disable-firewall xfs-tools" if [ -n "$USE_MIRRORS"]; then [ -n "$CENTOS_MIRROR" ] && cloudera_elements_sequence="$cloudera_elements_sequence centos-mirror" @@ -690,7 +690,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "cloudera" ]; then export DIB_CDH_VERSION="5.3" cloudera_5_3_centos_image_name=${cloudera_5_3_centos_image_name:-centos_sahara_cloudera_5_3_0} - cloudera_elements_sequence="vm ntp centos hadoop-cloudera selinux-permissive disable-firewall" + cloudera_elements_sequence="vm ntp centos hadoop-cloudera selinux-permissive disable-firewall xfs-tools" if [ -n "$USE_MIRRORS"]; then [ -n "$CENTOS_MIRROR" ] && cloudera_elements_sequence="$cloudera_elements_sequence centos-mirror" @@ -709,7 +709,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "cloudera" ]; then export DIB_CDH_VERSION="5.4" cloudera_5_4_centos_image_name=${cloudera_5_4_centos_image_name:-centos_sahara_cloudera_5_4_0} - cloudera_elements_sequence="vm ntp centos hadoop-cloudera selinux-permissive disable-firewall" + cloudera_elements_sequence="vm ntp centos hadoop-cloudera selinux-permissive disable-firewall xfs-tools" if [ -n "$USE_MIRRORS"]; then [ -n "$CENTOS_MIRROR" ] && cloudera_elements_sequence="$cloudera_elements_sequence centos-mirror" @@ -735,8 +735,8 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "mapr" ]; then #MapR repository requires additional space export DIB_MIN_TMPFS=10 - mapr_ubuntu_elements_sequence="vm ntp ssh ubuntu hadoop-mapr $JAVA_ELEMENT" - mapr_centos_elements_sequence="vm ntp centos ssh hadoop-mapr selinux-permissive $JAVA_ELEMENT disable-firewall" + mapr_ubuntu_elements_sequence="vm ntp ssh ubuntu hadoop-mapr xfs-tools $JAVA_ELEMENT" + mapr_centos_elements_sequence="vm ntp centos ssh hadoop-mapr selinux-permissive xfs-tools $JAVA_ELEMENT disable-firewall" if [ "$DEBUG_MODE" = "true" ]; then mapr_ubuntu_elements_sequence="$mapr_ubuntu_elements_sequence root-passwd" @@ -777,7 +777,7 @@ fi if [ -z "$PLUGIN" -o "$PLUGIN" = "plain" ]; then # generate plain (no Hadoop components) images for testing - common_elements="vm ntp ssh sahara-version" + common_elements="vm ntp ssh sahara-version xfs-tools" if [ "$DEBUG_MODE" = "true" ]; then common_elements="$common_elements root-passwd" fi diff --git a/elements/xfs-tools/README.rst b/elements/xfs-tools/README.rst new file mode 100644 index 00000000..7a494318 --- /dev/null +++ b/elements/xfs-tools/README.rst @@ -0,0 +1,5 @@ +========= +xfs-tools +========= + +This element installs a xfsprogs for formatting volumes to XFS file system. diff --git a/elements/xfs-tools/package-installs.yaml b/elements/xfs-tools/package-installs.yaml new file mode 100644 index 00000000..7a26be41 --- /dev/null +++ b/elements/xfs-tools/package-installs.yaml @@ -0,0 +1 @@ +xfsprogs: