openstack/sahara-image-elements
Code Issues Proposed changes

Build Xenial images for Vanilla and Storm

Browse Source 
Support for Ubuntu 16.04 is simple. Implement this and make it the
default building behavior.

Change-Id: I0e0f279afb88521f119365c2ea2cb9ce6320f58a
This commit is contained in:
Jeremy Freudberg 2017-07-19 19:49:17 +00:00
parent 3425012a84
commit c450ba9b18
4 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -504,7 +504,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "vanilla" ]; then
if [ -z "$HADOOP_VERSION" -o "$HADOOP_VERSION" = "2.7.1" ]; then
export DIB_HADOOP_VERSION=${DIB_HADOOP_VERSION_2_7_1:-"2.7.1"}
export ubuntu_image_name=${ubuntu_vanilla_hadoop_2_7_1_image_name:-"ubuntu_sahara_vanilla_hadoop_2_7_1_latest"}
export DIB_RELEASE=${DIB_RELEASE:-trusty}
export DIB_RELEASE=${DIB_RELEASE:-xenial}
image_create ubuntu $ubuntu_image_name $ubuntu_elements_sequence
unset DIB_RELEASE
fi
@ -587,7 +587,7 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "storm" ]; then
ubuntu_elements_sequence="$JAVA_ELEMENT zookeeper storm"
# Creating Ubuntu cloud image
export DIB_RELEASE=${DIB_RELEASE:-trusty}
export DIB_RELEASE=${DIB_RELEASE:-xenial}
image_create ubuntu $ubuntu_image_name $ubuntu_elements_sequence
unset DIB_RELEASE
unset DIB_CLOUD_INIT_DATASOURCES

22
elements/mysql/pkg-map
View File

@ -19,13 +19,23 @@
"mysql_java_package": "mysql-connector-java"
}
},
"release": {
"ubuntu": {
"trusty": {
"mysql_package": "mysql-client-5.5",
"mysql_libs_package": "",
"mysql_server_package": "mysql-server-5.5",
"mysql_java_package": "libmysql-java"
},
"xenial": {
"mysql_package": "mysql-client-5.7",
"mysql_libs_package": "",
"mysql_server_package": "mysql-server-5.7",
"mysql_java_package": "libmysql-java"
}
}
},
"family": {
"debian": {
"mysql_package": "mysql-client-5.5",
"mysql_libs_package": "",
"mysql_server_package": "mysql-server-5.5",
"mysql_java_package": "libmysql-java"
},
"redhat": {
"mysql_package": "mysql",
"mysql_libs_package": "mysql-libs",

9
elements/openjdk/install.d/33-java
View File

@ -10,7 +10,7 @@ echo "Installing OpenJDK"
default_jdk_version_for_distro () {
case "$DISTRO_NAME" in
centos | rhel | ubuntu )
centos | rhel )
echo "7"
;;
fedora )
@ -23,6 +23,13 @@ default_jdk_version_for_distro () {
centos7 | rhel7 )
echo "8"
;;
ubuntu )
if [ "$DIB_RELEASE" = "trusty" ]; then
echo "7"
elif [ "$DIB_RELEASE" = "xenial" ]; then
echo "8"
fi
;;
*)
echo "Unknown OpenJDK distro: $DISTRO_NAME" >&2
exit 1

6
elements/storm/install.d/60-storm
View File

@ -63,4 +63,10 @@ chown -R storm:storm /var/log/storm
apt-get install -y python-dev
apt-get install -y python-pip
if [ "$DIB_RELEASE" = "xenial" ]; then
apt-get install -y python-setuptools # See launchpad bug 1556681
apt-get install -y python-wheel
fi
pip install pyleus