openstack/sahara-plugin-mapr
Code Issues Proposed changes

Small fixes on MapR image gen.

Browse Source 
Updating the java install script and also fixing function call that is
not working on ubuntu image generation.

Change-Id: Ic6d3853e7137f5a2140628aa32e8f07428547527
This commit is contained in:
Telles Nobrega 2019-02-04 17:09:49 -03:00
parent 03b85b75bb
commit 1f4353f158
3 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sahara_plugin_mapr/plugins/mapr/resources/images/common/configure_extjs
View File

@ -8,7 +8,7 @@ extjs_basepath=$(basename ${EXTJS_DOWNLOAD_URL})
extjs_archive=/tmp/${extjs_basepath} extjs_archive=/tmp/${extjs_basepath}
extjs_folder="${extjs_basepath%.*}" extjs_folder="${extjs_basepath%.*}"
function setup_extjs { setup_extjs() {
curl -sS -o $extjs_archive $EXTJS_DOWNLOAD_URL curl -sS -o $extjs_archive $EXTJS_DOWNLOAD_URL
mkdir -p $EXTJS_DESTINATION_DIR mkdir -p $EXTJS_DESTINATION_DIR
} }

1
sahara_plugin_mapr/plugins/mapr/resources/images/image.yaml
View File

@ -150,7 +150,6 @@ validators:
- mysql-common - mysql-common
- nfs-common - nfs-common
- open-iscsi - open-iscsi
- openjdk-7-jre
- syslinux-common - syslinux-common
- zlib1g-dev - zlib1g-dev
- script: common/configure_extjs - script: common/configure_extjs

6
sahara_plugin_mapr/plugins/mapr/resources/images/ubuntu/install_openjdk
View File

@ -4,12 +4,6 @@ echo "Installing OpenJDK"
if [ $test_only -eq 0 ]; then if [ $test_only -eq 0 ]; then
apt-get install -y openjdk-7-jdk apt-get install -y openjdk-7-jdk
JRE_PATH=$(update-alternatives --list java)
JRE_HOME=${JRE_PATH%/bin/java}
JDK_PATH=$(update-alternatives --list javac)
JDK_HOME=${JDK_PATH%/bin/javac}
echo "OpenJDK has been installed" echo "OpenJDK has been installed"
else else
exit 0 exit 0