openstack
/
sahara-image-elements
Code Issues Proposed changes

Add elements for sync time on VM 

Add ntp element for all possible types of images.

Co-Authored-By: Vitaly Gridnev <vgridnev@mirantis.com>
Partially implements blueprint: support-ntp
Change-Id: I6efada8d731aae02378dfcb010709649745a9a44
This commit is contained in:
Sergey Reshetnyak 2014-10-20 17:21:10 +04:00 committed by Vitaly Gridnev
parent e437dd2ab2
commit 9c53a35d33
4 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -369,9 +369,9 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "vanilla" ]; then
export EXTJS_DOWNLOAD_URL=${EXTJS_DOWNLOAD_URL:-"http://dev.sencha.com/deploy/ext-2.2.zip"}
export HIVE_VERSION=${HIVE_VERSION:-"0.11.0"}
ubuntu_elements_sequence="vm ubuntu hadoop oozie mysql hive $JAVA_ELEMENT"
fedora_elements_sequence="vm fedora hadoop oozie mysql disable-firewall hive $JAVA_ELEMENT"
centos_elements_sequence="vm centos hadoop oozie mysql disable-firewall hive $JAVA_ELEMENT"
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"
if [ "$DEBUG_MODE" = "true" ]; then
ubuntu_elements_sequence="$ubuntu_elements_sequence root-passwd"
@ -462,7 +462,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "spark" ]; then
export DIB_CLOUD_INIT_DATASOURCES=$CLOUD_INIT_DATASOURCES
export DIB_SPARK_VERSION
COMMON_ELEMENTS="vm ubuntu $JAVA_ELEMENT swift_hadoop spark"
COMMON_ELEMENTS="vm ntp ubuntu $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"
@ -502,7 +502,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 ubuntu $JAVA_ELEMENT zookeeper storm"
ubuntu_elements_sequence="vm ntp ubuntu $JAVA_ELEMENT zookeeper storm"
if [ -n "$USE_MIRRORS" ]; then
[ -n "$UBUNTU_MIRROR" ] && ubuntu_elements_sequence="$ubuntu_elements_sequence apt-mirror"
@ -534,7 +534,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 centos hadoop-hdp yum $JAVA_ELEMENT"
centos_elements_sequence="vm ntp centos hadoop-hdp yum $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"
@ -552,7 +552,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 centos hadoop-hdp yum $JAVA_ELEMENT"
centos_elements_sequence="vm ntp centos hadoop-hdp yum $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"
@ -580,7 +580,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 ubuntu hadoop-cloudera"
cloudera_elements_sequence="vm ntp ubuntu hadoop-cloudera"
if [ -n "$USE_MIRRORS" ]; then
[ -n "$UBUNTU_MIRROR" ] && ubuntu_elements_sequence="$ubuntu_elements_sequence apt-mirror"
@ -594,7 +594,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 ubuntu hadoop-cloudera"
cloudera_elements_sequence="vm ntp ubuntu hadoop-cloudera"
if [ -n "$USE_MIRRORS" ]; then
[ -n "$UBUNTU_MIRROR" ] && ubuntu_elements_sequence="$ubuntu_elements_sequence apt-mirror"
@ -608,7 +608,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 ubuntu hadoop-cloudera"
cloudera_elements_sequence="vm ntp ubuntu hadoop-cloudera"
if [ -n "$USE_MIRRORS" ]; then
[ -n "$UBUNTU_MIRROR" ] && ubuntu_elements_sequence="$ubuntu_elements_sequence apt-mirror"
@ -632,7 +632,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 centos hadoop-cloudera selinux-permissive disable-firewall"
cloudera_elements_sequence="vm ntp centos hadoop-cloudera selinux-permissive disable-firewall"
if [ -n "$USE_MIRRORS"]; then
[ -n "$CENTOS_MIRROR" ] && cloudera_elements_sequence="$cloudera_elements_sequence centos-mirror"
@ -651,7 +651,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 centos hadoop-cloudera selinux-permissive disable-firewall"
cloudera_elements_sequence="vm ntp centos hadoop-cloudera selinux-permissive disable-firewall"
if [ -n "$USE_MIRRORS"]; then
[ -n "$CENTOS_MIRROR" ] && cloudera_elements_sequence="$cloudera_elements_sequence centos-mirror"
@ -670,7 +670,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 centos hadoop-cloudera selinux-permissive disable-firewall"
cloudera_elements_sequence="vm ntp centos hadoop-cloudera selinux-permissive disable-firewall"
if [ -n "$USE_MIRRORS"]; then
[ -n "$CENTOS_MIRROR" ] && cloudera_elements_sequence="$cloudera_elements_sequence centos-mirror"
@ -696,8 +696,8 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "mapr" ]; then
#MapR repository requires additional space
export DIB_MIN_TMPFS=10
mapr_ubuntu_elements_sequence="vm ssh ubuntu hadoop-mapr $JAVA_ELEMENT"
mapr_centos_elements_sequence="vm centos ssh hadoop-mapr selinux-permissive $JAVA_ELEMENT disable-firewall"
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"
if [ "$DEBUG_MODE" = "true" ]; then
mapr_ubuntu_elements_sequence="$mapr_ubuntu_elements_sequence root-passwd"
@ -738,7 +738,7 @@ fi
if [ -z "$PLUGIN" -o "$PLUGIN" = "plain" ]; then
# generate plain (no Hadoop components) images for testing
common_elements="vm ssh sahara-version"
common_elements="vm ntp ssh sahara-version"
if [ "$DEBUG_MODE" = "true" ]; then
common_elements="$common_elements root-passwd"
fi

5
elements/ntp/README.rst Normal file
View File

@ -0,0 +1,5 @@
===
ntp
===
Installs ntp daemon for sync time on VM

1
elements/ntp/elements-deps Normal file
View File

@ -0,0 +1 @@
package-installs

1
elements/ntp/package-installs.yaml Normal file
View File

@ -0,0 +1 @@
ntp: