diff options
Diffstat (limited to 'fuel')
| -rw-r--r-- | fuel/.DS_Store | bin | 0 -> 6148 bytes | |||
| -rwxr-xr-x | fuel/build/f_odl_docker/dockerfile/Dockerfile | 4 | ||||
| -rwxr-xr-x | fuel/build/f_odl_docker/dockerfile/container_scripts/check_feature.sh | 2 | ||||
| -rwxr-xr-x | fuel/build/f_odl_docker/dockerfile/container_scripts/speak.sh | 3 | ||||
| -rwxr-xr-x | fuel/build/f_odl_docker/dockerfile/container_scripts/start_odl_docker.sh | 4 | ||||
| -rw-r--r-- | fuel/build/patch-packages/Makefile | 2 | ||||
| -rw-r--r-- | fuel/build/patch-packages/novnc/Makefile | 22 | ||||
| -rwxr-xr-x | fuel/build/patch-packages/novnc/fix-missing.sh | 9 | ||||
| -rwxr-xr-x | fuel/build/patch-packages/tools/deb_pack | 2 | ||||
| -rw-r--r-- | fuel/docs/.DS_Store | bin | 0 -> 6148 bytes | |||
| -rw-r--r-- | fuel/docs/src/release-notes.rst | 59 |
11 files changed, 68 insertions, 39 deletions
diff --git a/fuel/.DS_Store b/fuel/.DS_Store Binary files differnew file mode 100644 index 0000000..b1bc858 --- /dev/null +++ b/fuel/.DS_Store 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/docs/.DS_Store b/fuel/docs/.DS_Store Binary files differnew file mode 100644 index 0000000..9a874b5 --- /dev/null +++ b/fuel/docs/.DS_Store diff --git a/fuel/docs/src/release-notes.rst b/fuel/docs/src/release-notes.rst index 221b7f7..0b8187c 100644 --- a/fuel/docs/src/release-notes.rst +++ b/fuel/docs/src/release-notes.rst @@ -1,20 +1,20 @@ :Authors: Jonas Bjurel (Ericsson) -:Version: 0.2 +:Version: 0.3 -================================================================ -OPNFV Release Note for "Arno-RC2 release candidate" - Fuel@OPNFV -================================================================ +===================================================================================== +OPNFV Release Note for the Arno release of OPNFV when using Fuel as a deployment tool +===================================================================================== Abstract ======== -This document provides the release notes for ARNO-RC2 release candidate of Fuel@OPNFV. +This document compiles the release notes for the ARNO release, when using Fuel as a deployment tool. License ======= -Fuel@OPNFV DOCs (c) by Jonas Bjurel (Ericsson AB) +Arno release with th Fuel deployment tool Docs (c) by Jonas Bjurel (Ericsson AB) -Fuel@OPNFV DOCs are licensed under a Creative Commons Attribution 4.0 International License. You should have received a copy of the license along with this. If not, see <http://creativecommons.org/licenses/by/4.0/>. +Arno release with the Fuel deployment tool Docs are licensed under a Creative Commons Attribution 4.0 International License. You should have received a copy of the license along with this. If not, see <http://creativecommons.org/licenses/by/4.0/>. **Contents** @@ -46,45 +46,44 @@ Fuel@OPNFV DOCs are licensed under a Creative Commons Attribution 4.0 Internatio | 2015-04-23 | 0.2 | Jonas Bjurel | Minor change | | | | | | +--------------------+--------------------+--------------------+--------------------+ +| 2015-05-12 | 0.3 | Chris Price | Minor edits | +| | | | | ++--------------------+--------------------+--------------------+--------------------+ 2 Important notes =================== -This is the first OPNFV Arno pre-release that implements the deploy stage of the OPNFV CI pipeline. +This is the first OPNFV release of Arno using Fuel as the deploment stage of the OPNFV CI pipeline. The intention of this release is to establish a foundation platform to accelerate the development of the OPNFV infrastructure. -Carefully follow the installation-instructions and pay special attention to the pre-deploy script that needs to be ran befor deployment is started. +Carefully follow the installation-instructions and pay special attention to the pre-deploy script that needs to be run befor deployment is started. 3 Summary =========== -Arno Fuel@OPNFV is based the OpenStack Fuel upstream project version 6.0.1, but adds OPNFV unique components such as OpenDaylight version: Helium as well as other OPNFV unique configurations. +Arno release with the Fuel deployment tool uses the OpenStack Fuel upstream project version 6.0.1, but adds OPNFV unique components such as OpenDaylight version: Helium as well as other OPNFV unique configurations. -This Arno pre-release of Fuel@OPNFV adds the deploy stage of the OPNFV CI pipeline +This Arno release artefact provides the Fuel deployment tool as the deploy stage of the OPNFV CI pipeline including: -- Documentation is built by Jenkins -- .iso image is built by Jenkins -- Jenkins deploy an Fuel@OPNFV stack instance on a nested hypervisor environment (KVM) +- Documentation built by Jenkins +- The Arno .iso image built by Jenkins +- Automated deployment of the Arno release with the Fuel deployment tool stack instance on bare metal or a nested hypervisor environment (KVM) +- Automated validation of the Arno deployment -Automatic test of the deployed system is not part of this pre-release. 4 Release Data ================ +--------------------------------------+--------------------------------------+ -| **Project** | Arno/genesis/fuel | +| **Project** | Arno/genesis/fuel | | | | +--------------------------------------+--------------------------------------+ -| **Repo/tag** | genesis/arno-rc2 | +| **Repo/tag** | genesis/arno | | | | +--------------------------------------+--------------------------------------+ -| **Release designation** | Arno RC2 | +| **Release designation** | Arno | | | | +--------------------------------------+--------------------------------------+ -| **Release date** | 2015-04-16 | -| | | -+--------------------------------------+--------------------------------------+ -| **Purpose of the delivery** | OPNFV Internal quality assurance | -| | and CI Pipline dry-run | +| **Release date** | 2015-Spring | | | | +--------------------------------------+--------------------------------------+ @@ -93,20 +92,18 @@ Automatic test of the deployed system is not part of this pre-release. 4.1.1 Module version changes ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -This is the first tracked version of genesis/fuel. It is based on following upstream versions: +This is the first tracked release of genesis/fuel. It is based on following upstream versions: - Fuel 6.0.1 (Juno release) - OpenDaylight Helium-SR2 -- Ubuntu 12.04.5 - 4.1.2 Document version changes ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This is the first tracked version of genesis/fuel. It comes with the following documentation: -- OPNFV Installation instructions for - Fuel@OPNFV - ver. 0.0.1 -- OPNFV Release Note for "Arno-RC2 release candidate" - Fuel@OPNFV - ver. 0.1 (this document) +- OPNFV Installation instructions for the Arno release with the Fuel deployment tool - ver. 0.0.1 +- OPNFV Release Notes for Arno release with the Fuel deployment tool - ver. 0.1 (this document) 4.2 Reason for version ---------------------- @@ -146,8 +143,8 @@ Fuel@OPNFV .iso file 4.3.2 Documentation deliverables ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -- OPNFV Installation instructions for - Fuel@OPNFV - ver. 0.0.1 -- OPNFV Release Note for "Arno-RC2 release candidate" - Fuel@OPNFV - ver. 0.1 (this document) +- OPNFV Installation instructions for Arno release with the Fuel deployment tool - ver. 0.0.1 +- OPNFV Release Note for Arno release with the Fuel deployment tool - ver. 0.1 (this document) 5 Known Limitations, Issues and Workarounds ============================================ @@ -186,7 +183,7 @@ Fuel@OPNFV .iso file 6 Test Result ============== -Fuel@OPNFV Arno RC2 has undergone QA test runs with the following results: +Arno release with the Fuel deployment tool has undergone QA test runs with the following results: +--------------------------------------+--------------------------------------+ | **TEST-SUITE** | **Results:** | |