summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules8
-rw-r--r--Makefile6
-rw-r--r--TODO.md6
-rw-r--r--docs/build-instruction.rst6
-rw-r--r--docs/configguide/installerconfig.rst16
-rw-r--r--docs/configguide/postinstall.rst3
-rw-r--r--docs/installation-instruction.rst15
-rw-r--r--docs/release-notes.rst62
-rw-r--r--patches/fuel-main/0004-FIXME-cobbler-setup.sh-Keep-extra-RPM-repos.patch50
-rw-r--r--patches/fuel-plugin-qemu/0001-Fix-apt-cache-and-qemu-version-handling.patch28
-rw-r--r--patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-opendaylight.patch (renamed from patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch)0
-rw-r--r--patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch21
-rw-r--r--patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch22
-rw-r--r--patches/opnfv-fuel/0008-Separate-armband-repo-comp-from-upstream-RPM-repos.patch (renamed from patches/opnfv-fuel/0010-Separate-armband-repo-comp-from-upstream-RPM-repos.patch)0
-rw-r--r--patches/opnfv-fuel/0009-f_repobuild-Makefile-Use-python-debian-from-pip.patch (renamed from patches/opnfv-fuel/0011-f_repobuild-Makefile-Use-python-debian-from-pip.patch)0
m---------upstream/fuel-plugin-ovsnfv0
m---------upstream/fuel-plugin-qemu0
17 files changed, 109 insertions, 134 deletions
diff --git a/.gitmodules b/.gitmodules
index 4f159866..5124f69a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,14 +22,6 @@
path = upstream/fuel-mirror
url = https://github.com/openstack/fuel-mirror.git
branch = stable/8.0
-[submodule "fuel-plugin-qemu"]
- path = upstream/fuel-plugin-qemu
- url = https://github.com/openstack/fuel-plugin-qemu.git
- branch = master
-[submodule "fuel-plugin-ovsnfv"]
- path = upstream/fuel-plugin-ovsnfv
- url = https://gerrit.opnfv.org/gerrit/p/ovsnfv.git
- branch = stable/brahmaputra
[submodule "fuel-plugin-opendaylight"]
path = upstream/fuel-plugin-opendaylight
url = https://github.com/openstack/fuel-plugin-opendaylight.git
diff --git a/Makefile b/Makefile
index a9261c56..1e123a82 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ endif
build:
cd ${root}/upstream/fuel/build && \
- time make \
+ make \
BUILD_FUEL_PLUGINS=f_odlpluginbuild \
FUEL_MAIN_REPO=${root}/upstream/fuel-main \
FUEL_MAIN_TAG= \
@@ -64,8 +64,6 @@ build:
FUEL_AGENT_REPO=${root}/upstream/fuel-agent \
FUEL_NAILGUN_AGENT_REPO=${root}/upstream/fuel-nailgun-agent \
FUEL_MIRROR_REPO=${root}/upstream/fuel-mirror \
- QEMU_REPO=${root}/upstream/fuel-plugin-qemu \
- OVSNFV_DPDK_REPO=${root}/upstream/fuel-plugin-ovsnfv \
ODL_REPO=${root}/upstream/fuel-plugin-opendaylight \
ODL_CHANGE= \
FUELLIB_COMMIT=HEAD \
@@ -73,8 +71,6 @@ build:
FUEL_AGENT_COMMIT=HEAD \
FUEL_NAILGUN_AGENT_COMMIT=HEAD \
FUEL_MIRROR_COMMIT=HEAD \
- QEMU_BRANCH=HEAD \
- OVSNFV_DPDK_BRANCH=armband-workbench \
ODL_BRANCH=armband-workbench \
PRODUCT_VERSION=8.0 \
PRODUCT_NAME=mos \
diff --git a/TODO.md b/TODO.md
index cce67cad..ad9c4937 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,18 +1,12 @@
List of missing features and things to do
=========================================
-Nice to have, should be fixed before rel
-=========================================
-* [fuel?] Disabling rx-vlan-filter from Fuel WebUI is not applied during netcheck
-
Cleanup tasks
=========================================
* [arm64-master] Find `puppetlabs-products` repo for arm64.
* [arm64-master] Fix license in ubuntu_1404_arm64.pp
* [arm64-master] Look into default ubuntu_debootstrap change in cobbler.pp
* [arm64-master] [fuel-agent] Package and repo update for arm64 in [2] (?)
-* [fuel] Add QEMU_VERSION for fuel-plugin-qemu
-* [ohai] ThunderX network card speed reported as N/A
* [arm64-master] change docker repo in `upstream/fuel/build/config.mk`,
perhaps by figuring out current architecture with `uname -m`
diff --git a/docs/build-instruction.rst b/docs/build-instruction.rst
index 254c0d3f..2d66b7c0 100644
--- a/docs/build-instruction.rst
+++ b/docs/build-instruction.rst
@@ -284,8 +284,8 @@ The artifacts produced are:
References
==========
-1) OPNFV Installation instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool
+1) `OPNFV Installation instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/brahmaputra/docs/installation-instruction.html>`_
-2) OPNFV Build instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool
+2) `OPNFV Build instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/brahmaputra/docs/build-instruction.html>`_
-3) OPNFV Release Note for the Brahmaputra release of OPNFV when using Fuel as a deployment tool
+3) `OPNFV Release Note for the Brahmaputra release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/brahmaputra/docs/release-notes.html>`_
diff --git a/docs/configguide/installerconfig.rst b/docs/configguide/installerconfig.rst
index 60ffadf1..07a50d94 100644
--- a/docs/configguide/installerconfig.rst
+++ b/docs/configguide/installerconfig.rst
@@ -28,7 +28,7 @@ following documents:
- Fuel planning guide, please see *Reference: 8* in section *"Fuel associated references"* below.
-- Fuel user guide, please see *Reference: 9* in section *"Fuel associated references"* below.
+- Fuel quick start guide, please see *Reference: 9* in section *"Fuel associated references"* below.
- Fuel operations guide, please see *Reference: 10* in section *"Fuel associated references"* below.
@@ -310,13 +310,13 @@ Fuel
6) `The Fuel OpenStack project <https://wiki.openstack.org/wiki/Fuel>`_
-7) `Fuel documentation overview <https://docs.fuel-infra.org/openstack/fuel/fuel-7.0/#guides>`_
+7) `Fuel documentation overview <https://docs.fuel-infra.org/openstack/fuel/fuel-8.0/>`_
-8) `Fuel planning guide <https://docs.mirantis.com/openstack/fuel/fuel-7.0/planning-guide.html>`_
+8) `Fuel planning guide <https://docs.fuel-infra.org/openstack/fuel/fuel-8.0/mos-planning-guide.html>`_
-9) `Fuel user guide <http://docs.mirantis.com/openstack/fuel/fuel-7.0/user-guide.html>`_
+9) `Fuel quick start guide <https://docs.mirantis.com/openstack/fuel/fuel-8.0/quickstart-guide.html>`_
-10) `Fuel operations guide <http://docs.mirantis.com/openstack/fuel/fuel-7.0/operations.html>`_
+10) `Fuel operations guide <https://docs.mirantis.com/openstack/fuel/fuel-8.0/operations.html>`_
11) `Fuel Plugin Developers Guide <https://wiki.openstack.org/wiki/Fuel/Plugins>`_
@@ -325,8 +325,8 @@ Fuel
Fuel in OPNFV
~~~~~~~~~~~~~
-13) OPNFV Installation instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool
+13) `OPNFV Installation instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/brahmaputra/docs/installation-instruction.html>`_
-14) OPNFV Build instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool
+14) `OPNFV Build instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/brahmaputra/docs/build-instruction.html>`_
-15) OPNFV Release Note for the Brahmaputra release of OPNFV when using Fuel as a deployment tool
+15) `OPNFV Release Note for the Brahmaputra release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/brahmaputra/docs/release-notes.html>`_
diff --git a/docs/configguide/postinstall.rst b/docs/configguide/postinstall.rst
index e80d72aa..5064e4a2 100644
--- a/docs/configguide/postinstall.rst
+++ b/docs/configguide/postinstall.rst
@@ -14,7 +14,8 @@ These validate the installation in terms of configuration, services,
networking, storage, policies, etc.
The execution of the full range of health checks takes less than 30 minutes.
-For instructions on how to run health-checks, please refer to the Fuel installation instructions.
+For instructions on how to run health-checks, please read the Fuel installation
+instructions.
Platform components validation
------------------------------
diff --git a/docs/installation-instruction.rst b/docs/installation-instruction.rst
index f7125816..787287a9 100644
--- a/docs/installation-instruction.rst
+++ b/docs/installation-instruction.rst
@@ -601,16 +601,15 @@ OpenDaylight
Fuel
----
-
6) `The Fuel OpenStack project <https://wiki.openstack.org/wiki/Fuel>`_
-7) `Fuel documentation overview <https://docs.fuel-infra.org/openstack/fuel/fuel-7.0/#guides>`_
+7) `Fuel documentation overview <https://docs.fuel-infra.org/openstack/fuel/fuel-8.0/>`_
-8) `Fuel planning guide <https://docs.mirantis.com/openstack/fuel/fuel-7.0/planning-guide.html>`_
+8) `Fuel planning guide <https://docs.fuel-infra.org/openstack/fuel/fuel-8.0/mos-planning-guide.html>`_
-9) `Fuel user guide <http://docs.mirantis.com/openstack/fuel/fuel-7.0/user-guide.html>`_
+9) `Fuel quick start guide <https://docs.mirantis.com/openstack/fuel/fuel-8.0/quickstart-guide.html>`_
-10) `Fuel operations guide <http://docs.mirantis.com/openstack/fuel/fuel-7.0/operations.html>`_
+10) `Fuel operations guide <https://docs.mirantis.com/openstack/fuel/fuel-8.0/operations.html>`_
11) `Fuel Plugin Developers Guide <https://wiki.openstack.org/wiki/Fuel/Plugins>`_
@@ -619,8 +618,8 @@ Fuel
Fuel in OPNFV
-------------
-13) OPNFV Installation instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool
+13) `OPNFV Installation instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/brahmaputra/docs/installation-instruction.html>`_
-14) OPNFV Build instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool
+14) `OPNFV Build instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/brahmaputra/docs/build-instruction.html>`_
-15) OPNFV Release Note for the Brahmaputra release of OPNFV when using Fuel as a deployment tool
+15) `OPNFV Release Note for the Brahmaputra release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/brahmaputra/docs/release-notes.html>`_
diff --git a/docs/release-notes.rst b/docs/release-notes.rst
index e731af02..7d86edbf 100644
--- a/docs/release-notes.rst
+++ b/docs/release-notes.rst
@@ -1,5 +1,5 @@
============================================================================================
-OPNFV Release Note for the Brahmaputra release of OPNFV when using Fuel as a deployment tool
+OPNFV Release Note for the Brahmaputra 3.0 release of OPNFV when using Fuel as a deployment tool
============================================================================================
License
@@ -12,14 +12,14 @@ License. .. http://creativecommons.org/licenses/by/4.0 ..
Abstract
========
-This document compiles the release notes for the Brahmaputra release of
+This document compiles the release notes for the Brahmaputra 3.0 release of
OPNFV when using Fuel as a deployment tool.
Important notes
===============
These notes provides release information for the use of Fuel as deployment
-tool for the Brahmaputra release of OPNFV.
+tool for the Brahmaputra 3.0 release of OPNFV.
The goal of the Brahmaputra release and this Fuel-based deployment process is
to establish a lab ready platform accelerating further development
@@ -33,7 +33,7 @@ Summary
For Brahmaputra, the typical use of Fuel as an OpenStack installer is
supplemented with OPNFV unique components such as:
-- `OpenDaylight <http://www.opendaylight.org/software>`_ version "Berylium RC1 as"
+- `OpenDaylight <http://www.opendaylight.org/software>`_ version "Berylium SR1"
- `ONOS <http://onosproject.org/>`_ version "Drake"
@@ -68,7 +68,6 @@ OPNFV CI pipeline including:
- Automated validation of the Brahmaputra deployment
-
Release Data
============
@@ -76,16 +75,23 @@ Release Data
| **Project** | fuel |
| | |
+--------------------------------------+--------------------------------------+
-| **Repo/tag** | brahmaputra.1.0 |
+| **Repo/tag** | brahmaputra.3.0 |
| | |
+--------------------------------------+--------------------------------------+
-| **Release designation** | Brahmaputra base release |
+| **Release designation** | Brahmaputra 3.0 follow-up release |
| | |
+--------------------------------------+--------------------------------------+
-| **Release date** | February 25 2016 |
+| **Release date** | April 28 2016 |
| | |
+--------------------------------------+--------------------------------------+
-| **Purpose of the delivery** | Brahmaputra base release |
+| **Purpose of the delivery** | Brahmaputra alignment to Released |
+| | Fuel 8.0 baseline + Bug-fixes for |
+| | the following feaures/scenarios: |
+| | - NFV Hypervisors-KVM |
+| | - Open vSwitch for NFV |
+| | - OpenDaylight SR1 |
+| | - SDN distributed routing and VPN |
+| | - Service function chaining |
| | |
+--------------------------------------+--------------------------------------+
@@ -94,20 +100,20 @@ Version change
Module version changes
~~~~~~~~~~~~~~~~~~~~~~
-This is the second tracked release of genesis/fuel. It is based on
+This is a follow-up release to Brahmaputra 1.0. It is based on
following upstream versions:
-- Fuel 8.0 pre-release
+- Fuel 8.0 Base release
- OpenStack Liberty release
-- OpenDaylight Beryllium release
+- OpenDaylight Beryllium SR1 release
- ONOS Drake release
Document changes
~~~~~~~~~~~~~~~~
-This is the third tracked version of the fuel installer for OPNFV. It
+This is a follow-up release to Brahmaputra 1.0. It
comes with the following documentation:
- Installation instructions - *Reference 13* - **Changed**
@@ -124,14 +130,16 @@ Feature additions
**JIRA TICKETS:**
-`New features <https://jira.opnfv.org/issues/?filter=11002>`_ 'https://jira.opnfv.org/issues/?filter=11002'
+-
Bug corrections
~~~~~~~~~~~~~~~
**JIRA TICKETS:**
-`Bug-fixes <https://jira.opnfv.org/browse/FUEL-99?filter=11001>`_ 'https://jira.opnfv.org/browse/FUEL-99?filter=11001'
+`Workarounds <https://jira.opnfv.org/issues/?filter=11121>`_ 'https://jira.opnfv.org/issues/?filter=11121'
+
+(Also See respective Integrated feature project's bug tracking)
Deliverables
------------
@@ -170,16 +178,22 @@ Known issues
**JIRA TICKETS:**
-`Known issues <https://jira.opnfv.org/issues/?filter=11000>`_ 'https://jira.opnfv.org/issues/?filter=11000'
+`Known issues <https://jira.opnfv.org/issues/?filter=11119>`_ 'https://jira.opnfv.org/issues/?filter=11119'
+
+(Also See respective Integrated feature project's bug tracking)
Workarounds
-----------
+**JIRA TICKETS:**
+
+`Workarounds <https://jira.opnfv.org/issues/?filter=11120>`_ 'https://jira.opnfv.org/issues/?filter=11120'
+(Also See respective Integrated feature project's bug tracking)
Test results
============
-The Brahmaputra release with the Fuel deployment tool has undergone QA test
+The Brahmaputra 3.0 release with the Fuel deployment tool has undergone QA test
runs, see separate test results.
References
@@ -210,13 +224,13 @@ Fuel
6) `The Fuel OpenStack project <https://wiki.openstack.org/wiki/Fuel>`_
-7) `Fuel documentation overview <https://docs.fuel-infra.org/openstack/fuel/fuel-7.0/#guides>`_
+7) `Fuel documentation overview <https://docs.fuel-infra.org/openstack/fuel/fuel-8.0/>`_
-8) `Fuel planning guide <https://docs.mirantis.com/openstack/fuel/fuel-7.0/planning-guide.html>`_
+8) `Fuel planning guide <https://docs.fuel-infra.org/openstack/fuel/fuel-8.0/mos-planning-guide.html>`_
-9) `Fuel user guide <http://docs.mirantis.com/openstack/fuel/fuel-7.0/user-guide.html>`_
+9) `Fuel quick start guide <https://docs.mirantis.com/openstack/fuel/fuel-8.0/quickstart-guide.html>`_
-10) `Fuel operations guide <http://docs.mirantis.com/openstack/fuel/fuel-7.0/operations.html>`_
+10) `Fuel operations guide <https://docs.mirantis.com/openstack/fuel/fuel-8.0/operations.html>`_
11) `Fuel Plugin Developers Guide <https://wiki.openstack.org/wiki/Fuel/Plugins>`_
@@ -225,8 +239,8 @@ Fuel
Fuel in OPNFV
-------------
-13) OPNFV Installation instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool
+13) `OPNFV Installation instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/brahmaputra/docs/installation-instruction.html>`_
-14) OPNFV Build instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool
+14) `OPNFV Build instruction for the Brahmaputra release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/brahmaputra/docs/build-instruction.html>`_
-15) OPNFV Release Note for the Brahmaputra release of OPNFV when using Fuel as a deployment tool
+15) `OPNFV Release Note for the Brahmaputra release of OPNFV when using Fuel as a deployment tool <http://artifacts.opnfv.org/fuel/brahmaputra/docs/release-notes.html>`_
diff --git a/patches/fuel-main/0004-FIXME-cobbler-setup.sh-Keep-extra-RPM-repos.patch b/patches/fuel-main/0004-FIXME-cobbler-setup.sh-Keep-extra-RPM-repos.patch
new file mode 100644
index 00000000..e3dceeda
--- /dev/null
+++ b/patches/fuel-main/0004-FIXME-cobbler-setup.sh-Keep-extra-RPM-repos.patch
@@ -0,0 +1,50 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Thu, 28 Apr 2016 01:41:45 +0200
+Subject: [PATCH] FIXME: cobbler: setup.sh: Keep extra RPM repos.
+
+cobbler-grub-aarch64 (arm64 specific loader) is currently
+distributed and added to the cobbler docker container during
+ISO build using EXTRA_RPM_REPOS envvar mechanism.
+
+However, since this package installs files in a mounted location,
+its contents are not persistent, requiring a test and eventual
+forced reinstall during container start.
+
+This, of course, requires the package to be available at that point,
+which is not currently possible, as we remove the extra RPM repository
+entry from yum config at the end of container build.
+
+Hacky temporary workaround:
+Re-add extra RPM yum config after container is set up, only for cobbler.
+
+TODO: This patch should be dropped once cobbler-grub-aarch64 RPM
+package gets upstreamed.
+---
+ docker/cobbler/setup.sh | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/docker/cobbler/setup.sh b/docker/cobbler/setup.sh
+index 90627a8..508eaa4 100644
+--- a/docker/cobbler/setup.sh
++++ b/docker/cobbler/setup.sh
+@@ -80,6 +80,20 @@ baseurl=file:/var/www/nailgun/mos-centos/x86_64
+ gpgcheck=0
+ EOF
+
++## FIXME(armband): Add extra RPM repository in Cobbler container
++# Normally, extra RPM repos are not re-added post-build, but we
++# need cobbler-grub-aarch64 during each container start.
++
++for repo in ${EXTRA_RPM_REPOS}; do
++ IFS=, read -a repo_args <<< "$repo"
++ cat << EOF >> /etc/yum.repos.d/nailgun.repo
++
++[extra-repo-${repo_args[0]}]
++name=MOS Extra Repo ${repo_args[0]}
++baseurl=file:/var/www/nailgun/extra-repos/${repo_args[0]}
++gpgcheck=0
++EOF
++done
+ yum clean all
+
+
diff --git a/patches/fuel-plugin-qemu/0001-Fix-apt-cache-and-qemu-version-handling.patch b/patches/fuel-plugin-qemu/0001-Fix-apt-cache-and-qemu-version-handling.patch
deleted file mode 100644
index 9a77c3a3..00000000
--- a/patches/fuel-plugin-qemu/0001-Fix-apt-cache-and-qemu-version-handling.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
-Date: Fri, 4 Mar 2016 14:26:43 +0100
-Subject: [PATCH] Fix apt cache and qemu version handling
-
----
- qemu/build-qemu.sh | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/qemu/build-qemu.sh b/qemu/build-qemu.sh
-index 652939e..f54f486 100755
---- a/qemu/build-qemu.sh
-+++ b/qemu/build-qemu.sh
-@@ -1,11 +1,12 @@
- #!/bin/bash
- wget http://wiki.qemu-project.org/download/qemu-2.2.1.tar.bz2
-+sudo apt-get update -y
- sudo apt-get build-dep qemu -y
- sudo apt-get install devscripts -y
- sudo apt-get install dpkg-dev -y
--apt-get source qemu -y
--dpkg-source -x qemu_2.0.0+dfsg-2ubuntu1.21.dsc
--cd qemu-2.0.0+dfsg; uupdate -v 2.2.1 ../qemu-2.2.1.tar.bz2
-+apt-get source qemu=2.0.0 -y
-+dpkg-source -x qemu_2.0.0*.dsc
-+cd qemu-2.0.0*; uupdate -v 2.2.1 ../qemu-2.2.1.tar.bz2
- cd ../qemu-2.2.1;echo "">> debian/patches/series
- sed -i 's/seccomp="yes"/seccomp="no"/' configure
- debian/rules build
diff --git a/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch b/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-opendaylight.patch
index c47b166c..c47b166c 100644
--- a/patches/opnfv-fuel/0009-Allow-customizing-fuel-plugin-opendaylight.patch
+++ b/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-opendaylight.patch
diff --git a/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch b/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch
deleted file mode 100644
index 4ce6d83e..00000000
--- a/patches/opnfv-fuel/0007-Allow-customizing-fuel-plugin-qemu.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
-Date: Fri, 4 Mar 2016 14:27:48 +0100
-Subject: [PATCH] Allow customizing fuel-plugin-qemu
-
----
- build/f_isoroot/f_qemupluginbuild/config.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/build/f_isoroot/f_qemupluginbuild/config.mk b/build/f_isoroot/f_qemupluginbuild/config.mk
-index 0b84654..e7fb65a 100644
---- a/build/f_isoroot/f_qemupluginbuild/config.mk
-+++ b/build/f_isoroot/f_qemupluginbuild/config.mk
-@@ -7,6 +7,6 @@
- # http://www.apache.org/licenses/LICENSE-2.0
- ##############################################################################
-
--QEMU_BRANCH=c35ce3377bcf382a4e36f1df49758100cd2910b1
--QEMU_REPO=https://review.openstack.org/openstack/fuel-plugin-qemu
-+QEMU_BRANCH:=c35ce3377bcf382a4e36f1df49758100cd2910b1
-+QEMU_REPO:=https://review.openstack.org/openstack/fuel-plugin-qemu
- QEMU_CHANGE=
diff --git a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch b/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch
deleted file mode 100644
index c427394f..00000000
--- a/patches/opnfv-fuel/0008-Allow-customizing-fuel-plugin-ovsnfv.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Stanislaw Kardach <stanislaw.kardach@caviumnetworks.com>
-Date: Sat, 5 Mar 2016 15:08:10 +0100
-Subject: [PATCH] Allow customizing fuel-plugin-ovsnfv
-
----
- build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk
-index 1893fce..f29dab5 100644
---- a/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk
-+++ b/build/f_isoroot/f_ovsnfv-dpdk-pluginbuild/config.mk
-@@ -7,7 +7,7 @@
- # http://www.apache.org/licenses/LICENSE-2.0
- ##############################################################################
-
--OVSNFV_DPDK_BRANCH=stable/brahmaputra
--OVSNFV_DPDK_REPO=https://gerrit.opnfv.org/gerrit/p/ovsnfv.git
-+OVSNFV_DPDK_BRANCH:=stable/brahmaputra
-+OVSNFV_DPDK_REPO:=https://gerrit.opnfv.org/gerrit/p/ovsnfv.git
- OVSNFV_DPDK_DIR=fuel-plugin-ovsnfv
- OVSNFV_DPDK_CHANGE=
diff --git a/patches/opnfv-fuel/0010-Separate-armband-repo-comp-from-upstream-RPM-repos.patch b/patches/opnfv-fuel/0008-Separate-armband-repo-comp-from-upstream-RPM-repos.patch
index 670e8728..670e8728 100644
--- a/patches/opnfv-fuel/0010-Separate-armband-repo-comp-from-upstream-RPM-repos.patch
+++ b/patches/opnfv-fuel/0008-Separate-armband-repo-comp-from-upstream-RPM-repos.patch
diff --git a/patches/opnfv-fuel/0011-f_repobuild-Makefile-Use-python-debian-from-pip.patch b/patches/opnfv-fuel/0009-f_repobuild-Makefile-Use-python-debian-from-pip.patch
index f84b4c0c..f84b4c0c 100644
--- a/patches/opnfv-fuel/0011-f_repobuild-Makefile-Use-python-debian-from-pip.patch
+++ b/patches/opnfv-fuel/0009-f_repobuild-Makefile-Use-python-debian-from-pip.patch
diff --git a/upstream/fuel-plugin-ovsnfv b/upstream/fuel-plugin-ovsnfv
deleted file mode 160000
-Subproject 8a312b9535b2f3fe721139ed37722a13d1a940b
diff --git a/upstream/fuel-plugin-qemu b/upstream/fuel-plugin-qemu
deleted file mode 160000
-Subproject 1eb8bf930e2ec6e64526e95fcb21124f7401a24