x
/
fuel-plugin-opendaylight
Code Issues Proposed changes

Including openjdk is no longer required 

Openjdk package is now shipped in mos respositiories on fuel master.

Change-Id: I275cd5854a0700695473e5b07d04a1838e12683f
Signed-off-by: Michal Skalski <mskalski@mirantis.com>
This commit is contained in:
Michal Skalski 2016-06-10 16:02:44 +02:00
parent 1c8443ffc6
commit 8eb70403e0
3 changed files with 4 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@ -85,13 +85,6 @@ Build options
It is possible to modify process of building plugin by setting environment variables. Look into [pre_build_hook file](pre_build_hook) for more details.
Dependencies
------------
OpenDaylight use Java Runtime Environment, required packages will be downloaded from ubuntu repositores.
Ubuntu trusty provides openjdk-7, export USE_JAVA8=true environment variable during plugin compilation to fetch
openjdk-8. JAVA8_URL variable points to the localization of openjdk-8 deb package, default value is defined in
[pre_build_hook file](pre_build_hook) file and can be overwritten by environment variable.
Testing
-------

6
odl_package/ubuntu/opendaylight
View File

@ -9,8 +9,7 @@ setgid odl
setuid odl
env KARAF_HOME="/opt/opendaylight"
env JAVA_HOME="/usr/lib/jvm/java-7-openjdk-amd64"
env JAVA_OPTS="-server -Xms256M -Xmx2048M -XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -XX:MaxPermSize=512M -Dcom.sun.management.jmxremote"
env JAVA_OPTS="-server -Xms256M -Xmx2048M -XX:+UnlockDiagnosticVMOptions -XX:+UnsyncloadClass -Dcom.sun.management.jmxremote"
env OPTS="-Dkaraf.startLocalConsole=false -Dkaraf.startRemoteShell=true"
env MAIN="org.apache.karaf.main.Main"
@ -21,6 +20,7 @@ script
# Try to find lang used in system
test -f /etc/default/locale && . /etc/default/locale || true
export LANG=$LANG
export JAVA_HOME=$(readlink -f /usr/bin/java | sed "s:/jre/bin/java::")
export KARAF_BASE="$KARAF_HOME"
export KARAF_DATA="$KARAF_BASE/data"
export KARAF_ETC="$KARAF_BASE/etc"
@ -37,6 +37,6 @@ script
fi
done
exec /usr/bin/java $JAVA_OPTS -Djava.endorsed.dirs="${JAVA_ENDORSED_DIRS}" -Djava.ext.dirs="${JAVA_EXT_DIRS}" -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Dkaraf.data="$KARAF_DATA" -Dkaraf.etc="$KARAF_ETC" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" $KARAF_OPTS $OPTS -classpath "$CLASSPATH" $MAIN
exec ${JAVA_HOME}/bin/java $JAVA_OPTS -Djava.endorsed.dirs="${JAVA_ENDORSED_DIRS}" -Djava.ext.dirs="${JAVA_EXT_DIRS}" -Dkaraf.instances="${KARAF_HOME}/instances" -Dkaraf.home="$KARAF_HOME" -Dkaraf.base="$KARAF_BASE" -Dkaraf.data="$KARAF_DATA" -Dkaraf.etc="$KARAF_ETC" -Djava.io.tmpdir="$KARAF_DATA/tmp" -Djava.util.logging.config.file="$KARAF_BASE/etc/java.util.logging.properties" $KARAF_OPTS $OPTS -classpath "$CLASSPATH" $MAIN
end script

29
pre_build_hook
View File

@ -8,7 +8,6 @@ set -eux
# Where we can find odl karaf distribution tarball
# can be http(s) url or absolute path
ODL_TARBALL_LOCATION=${ODL_TARBALL_LOCATION:-https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.4.2-Beryllium-SR2/distribution-karaf-0.4.2-Beryllium-SR2.tar.gz}
JAVA8_URL=${JAVA8_URL:-https://launchpad.net/~openjdk-r/+archive/ubuntu/ppa/+files/openjdk-8-jre-headless_8u72-b15-1~trusty1_amd64.deb}
#ODL openflowjava NSH subtype patch related
# The patch's TAG should mach with ODL release being patched
@ -50,18 +49,8 @@ MODULES="${DIR}/deployment_scripts/puppet/modules"
#Remove temporary files
CLEANUP=${CLEANUP:-true}
# If true openjdk-8 will be used
USE_JAVA8=${USE_JAVA8:-false}
if [ "$USE_JAVA8" = true ]
then
JAVA_VERSION="openjdk-8-jre-headless"
else
JAVA_VERSION="openjdk-7-jre-headless"
fi
function cleanup {
rm -rf "${TMP_DIR}"
sed -i -e "s/java-8-openjdk-amd64/java-7-openjdk-amd64/" "${DIR}/odl_package/ubuntu/opendaylight"
}
function download {
@ -89,15 +78,6 @@ function add_opnfv_quagga {
}
# Download packages required by ODL.
function download_dependencies {
if [ "$USE_JAVA8" = true ]
then
wget -N "$JAVA8_URL"
fi
}
#
#ODL patch related
function putbldenv() {
@ -182,15 +162,13 @@ function build_pkg {
centos)
pushd "${DIR}/repositories/${1}/"
fpm --force -s dir -t rpm --version "${ODL_VERSION_NUMBER}" --description "${ODL_DESCRIPTION}" --prefix /opt/opendaylight --rpm-init "${DIR}/odl_package/${1}/opendaylight" --after-install "${DIR}/odl_package/${1}/opendaylight-post" --name opendaylight -d "java-1.7.0-openjdk" -C "${TMP_DIR}/opendaylight_src"
download_dependencies ${1}
popd
;;
ubuntu)
pushd "${DIR}/repositories/${1}/"
fpm --architecture all --force -s dir -t deb -m 'mskalski@mirantis.com' --version "${ODL_VERSION_NUMBER}" --description "${ODL_DESCRIPTION}" --prefix /opt/opendaylight --deb-upstart "${DIR}/odl_package/${1}/opendaylight" --after-install "${DIR}/odl_package/${1}/opendaylight-post" --name opendaylight -d "${JAVA_VERSION}" -C "${TMP_DIR}/opendaylight_src"
fpm --architecture all --force -s dir -t deb -m 'mskalski@mirantis.com' --version "${ODL_VERSION_NUMBER}" --description "${ODL_DESCRIPTION}" --prefix /opt/opendaylight --deb-upstart "${DIR}/odl_package/${1}/opendaylight" --after-install "${DIR}/odl_package/${1}/opendaylight-post" --name opendaylight -d openjdk-8-jre-headless -C "${TMP_DIR}/opendaylight_src"
patch_networking_odl_deb ${TMP_DIR}/networking_odl/requirements.txt
fpm --architecture all --force -s python -t deb -m 'mskalski@mirantis.com' --python-install-lib /usr/lib/python2.7/dist-packages ${TMP_DIR}/networking_odl/setup.py
download_dependencies ${1}
popd
add_opnfv_quagga "${DIR}/repositories/${1}/"
;;
@ -202,11 +180,6 @@ command -v fpm >/dev/null 2>&1 || { echo >&2 "fpm ruby gem required but it's not
cleanup
if [ "$USE_JAVA8" = true ]
then
sed -i -e "s/java-7-openjdk-amd64/java-8-openjdk-amd64/" "${DIR}/odl_package/ubuntu/opendaylight"
fi
mkdir -p "${TMP_DIR}"
pushd $TMP_DIR