diff options
Diffstat (limited to 'fuel')
10 files changed, 68 insertions, 24 deletions
diff --git a/fuel/build/f_odl_docker/dockerfile/Dockerfile b/fuel/build/f_odl_docker/dockerfile/Dockerfile index e8d5953..e3c7ee5 100755 --- a/fuel/build/f_odl_docker/dockerfile/Dockerfile +++ b/fuel/build/f_odl_docker/dockerfile/Dockerfile @@ -32,11 +32,11 @@ RUN bash -c 'echo "export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64" >> ~/.bas #Now lets got and fetch the ODL distribution RUN echo "Fetching ODL" -RUN wget https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.2-Helium-SR2/distribution-karaf-0.2.2-Helium-SR2.tar.gz -O /opt/odl_source/distribution-karaf-0.2.2-Helium-SR2.tar.gz +RUN wget https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.3-Helium-SR3/distribution-karaf-0.2.3-Helium-SR3.tar.gz -O /opt/odl_source/distribution-karaf-0.2.3-Helium-SR3.tar.gz RUN echo "Untarring ODL inplace" RUN mkdir -p /opt/odl -RUN tar zxvf /opt/odl_source/distribution-karaf-0.2.2-Helium-SR2.tar.gz -C /opt/odl +RUN tar zxvf /opt/odl_source/distribution-karaf-0.2.3-Helium-SR3.tar.gz -C /opt/odl RUN echo "Installing DLUX and other features into ODL" COPY tmp/dockerfile/container_scripts/start_odl_docker.sh /etc/init.d/start_odl_docker.sh diff --git a/fuel/build/f_odl_docker/dockerfile/container_scripts/check_feature.sh b/fuel/build/f_odl_docker/dockerfile/container_scripts/check_feature.sh index fc21fc9..3e5d0b2 100755 --- a/fuel/build/f_odl_docker/dockerfile/container_scripts/check_feature.sh +++ b/fuel/build/f_odl_docker/dockerfile/container_scripts/check_feature.sh @@ -1,5 +1,5 @@ #!/usr/bin/expect -spawn /opt/odl/distribution-karaf-0.2.2-Helium-SR2/bin/client +spawn /opt/odl/distribution-karaf-0.2.3-Helium-SR3/bin/client expect "root>" send "feature:list | grep -i odl-restconf\r" send "\r\r\r" diff --git a/fuel/build/f_odl_docker/dockerfile/container_scripts/speak.sh b/fuel/build/f_odl_docker/dockerfile/container_scripts/speak.sh index 2d363c9..3ba07a8 100755 --- a/fuel/build/f_odl_docker/dockerfile/container_scripts/speak.sh +++ b/fuel/build/f_odl_docker/dockerfile/container_scripts/speak.sh @@ -6,8 +6,9 @@ # Simple expect script to start up ODL client and load feature set for DLUX and OVSDB # # NOTE: THIS WILL BE REPLACED WITH A PROGRAMATIC METHOD SHORTLY +# DEPRECATED AFTER ARNO -spawn /opt/odl/distribution-karaf-0.2.2-Helium-SR2/bin/client +spawn /opt/odl/distribution-karaf-0.2.3-Helium-SR3/bin/client expect "root>" send "feature:install odl-base-all odl-aaa-authn odl-restconf odl-nsf-all odl-adsal-northbound odl-mdsal-apidocs odl-ovsdb-openstack odl-ovsdb-northbound odl-dlux-core" send "\r\r\r" diff --git a/fuel/build/f_odl_docker/dockerfile/container_scripts/start_odl_docker.sh b/fuel/build/f_odl_docker/dockerfile/container_scripts/start_odl_docker.sh index a985b97..1c72dda 100755 --- a/fuel/build/f_odl_docker/dockerfile/container_scripts/start_odl_docker.sh +++ b/fuel/build/f_odl_docker/dockerfile/container_scripts/start_odl_docker.sh @@ -13,7 +13,7 @@ export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-amd64 #MAIN echo "Starting up the da Sheilds..." -/opt/odl/distribution-karaf-0.2.2-Helium-SR2/bin/karaf server & +/opt/odl/distribution-karaf-0.2.3-Helium-SR3/bin/karaf server & echo "Sleeping 5 bad hack" sleep 10 echo "should see stuff listening now" @@ -33,6 +33,6 @@ ps -efa while true; do echo "Checking status of ODL:" - /opt/odl/distribution-karaf-0.2.2-Helium-SR2/bin/status + /opt/odl/distribution-karaf-0.2.3-Helium-SR3/bin/status sleep 60 done diff --git a/fuel/build/patch-packages/Makefile b/fuel/build/patch-packages/Makefile index 5d7d200..4388677 100644 --- a/fuel/build/patch-packages/Makefile +++ b/fuel/build/patch-packages/Makefile @@ -8,7 +8,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -SUBDIRS := debootstrap +SUBDIRS := debootstrap novnc SUBCLEAN = $(addsuffix .clean,$(SUBDIRS)) .PHONY: $(SUBDIRS) $(SUBCLEAN) clean diff --git a/fuel/build/patch-packages/novnc/Makefile b/fuel/build/patch-packages/novnc/Makefile new file mode 100644 index 0000000..16c0196 --- /dev/null +++ b/fuel/build/patch-packages/novnc/Makefile @@ -0,0 +1,22 @@ +# This is a temporary patch which add missing files +# inside novnc ubuntu package. +# Related bug: https://bugs.launchpad.net/fuel/+bug/1433894 +TOP := $(shell pwd) + +.PHONY: all +all: + +.PHONY: clean +clean: + @rm -rf package + @rm -rf *.deb + @rm -rf patch-replacements + @rm -rf .package + +.PHONY: release +release: + ../tools/deb_unpack novnc_0.5.1*.deb $(ORIGISO) + ./fix-missing.sh + ../tools/deb_pack $(REVSTATE) + @cp *.deb ../release/packages + @cat patch-replacements >> ../release/patch-replacements diff --git a/fuel/build/patch-packages/novnc/fix-missing.sh b/fuel/build/patch-packages/novnc/fix-missing.sh new file mode 100755 index 0000000..61ef1db --- /dev/null +++ b/fuel/build/patch-packages/novnc/fix-missing.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +MISSING_FILES="keyboard.js keysymdef.js keysym.js" +NOVNC_SOURCE="http://raw.githubusercontent.com/kanaka/noVNC/v0.5.1/include" + +for file in $MISSING_FILES +do + wget -P package/usr/share/novnc/include/ "$NOVNC_SOURCE/$file" +done diff --git a/fuel/build/patch-packages/tools/deb_pack b/fuel/build/patch-packages/tools/deb_pack index f07a15d..f5d42de 100755 --- a/fuel/build/patch-packages/tools/deb_pack +++ b/fuel/build/patch-packages/tools/deb_pack @@ -21,7 +21,7 @@ ME=$(basename $0) trap my_exit EXIT -REV=$1 +REV="$(echo $1 | tr '_' '-')" if [ -z "$REV" ]; then echo "$ME: Error - no revision info provided" exit 1 diff --git a/fuel/prototypes/auto-deploy/deploy/deploy.sh b/fuel/prototypes/auto-deploy/deploy/deploy.sh index 938efb6..f5aa634 100755 --- a/fuel/prototypes/auto-deploy/deploy/deploy.sh +++ b/fuel/prototypes/auto-deploy/deploy/deploy.sh @@ -13,7 +13,6 @@ topdir=$(dirname $(readlink -f $BASH_SOURCE)) exampledir=$(cd $topdir/../examples; pwd) functions=${topdir}/functions -tmpdir=$HOME/fueltmp # Define common functions . ${functions}/common.sh @@ -61,7 +60,23 @@ if [ $# -ne 3 ]; then exit 1 fi -# Setup tmpdir +# Setup tmpdir - if TMPDIR env variable is set, use that one +# else create in $HOME/fueltmp +if [ -n "${TMPDIR}" ]; then + if [ -d ${TMPDIR} ]; then + tmpdir=${TMPDIR}/fueltmp + echo "Using TMPDIR=${TMPDIR}, so tmpdir=${tmpdir}" + else + error_exit "No such directory for TMPDIR: ${TMPDIR}" + fi +else + tmpdir=${HOME}/fueltmp + echo "Default: tmpdir=$tmpdir" +fi + +# Umask must be changed so files created are readable by qemu +umask 0022 + if [ -d $tmpdir ]; then rm -Rf $tmpdir || error_exit "Could not remove tmpdir $tmpdir" fi @@ -74,9 +89,9 @@ dhafile=$(cd `dirname $3`; echo `pwd`/`basename $3`) if [ ! -f $isofile ]; then error_exit "Could not find ISO file $isofile" elif [ ! -f $deafile ]; then - error-exit "Could not find DEA file $deafile" + error_exit "Could not find DEA file $deafile" elif [ ! -f $dhafile ]; then - error-exit "Could not find DHA file $dhafile" + error_exit "Could not find DHA file $dhafile" fi # Connect adapter diff --git a/fuel/prototypes/auto-deploy/deploy/functions/patch-iso.sh b/fuel/prototypes/auto-deploy/deploy/functions/patch-iso.sh index 933281f..d27dcdf 100755 --- a/fuel/prototypes/auto-deploy/deploy/functions/patch-iso.sh +++ b/fuel/prototypes/auto-deploy/deploy/functions/patch-iso.sh @@ -9,13 +9,10 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -# This is a temporary script - this should be rolled into a separate -# build target "make ci-iso" instead! - exit_handler() { rm -Rf $tmpnewdir fusermount -u $tmporigdir 2>/dev/null - test -d $tmporigdir && mdir $tmporigdir + test -d $tmporigdir && rmdir $tmporigdir } trap exit_handler exit @@ -39,8 +36,8 @@ fuelGateway=$6 fuelHostname=$7 fuelDns=$8 -tmporigdir=/${tmpdir}/origiso -tmpnewdir=/${tmpdir}/newiso +tmporigdir=${tmpdir}/origiso +tmpnewdir=${tmpdir}/newiso test -f $origiso || error_exit "Could not find origiso $origiso" test -d $tmpdir || error_exit "Could not find tmpdir $tmpdir" @@ -51,15 +48,15 @@ if [ "`whoami`" != "root" ]; then fi echo "Copying..." -rm -Rf $tmporigdir $tmpnewdir +rm -Rf $tmpnewdir || error_exit "Failed deleting old ISO copy dir" mkdir -p $tmporigdir $tmpnewdir -fuseiso $origiso $tmporigdir || error_exit "Failed fuseiso" +fuseiso $origiso $tmporigdir || error_exit "Failed to FUSE mount ISO" cd $tmporigdir -find . | cpio -pd $tmpnewdir +find . | cpio -pd $tmpnewdir || error_exit "Failed to copy FUSE ISO with cpio" cd $tmpnewdir -fusermount -u $tmporigdir -rmdir $tmporigdir -chmod -R 755 $tmpnewdir +fusermount -u $tmporigdir || error_exit "Failed to FUSE unmount ISO" +rmdir $tmporigdir || error_exit "Failed to delete original FUSE ISO directory" +chmod -R 755 $tmpnewdir || error_exit "Failed to set protection on new ISO dir" echo "Patching..." cd $tmpnewdir |