Rebase: Deal with upstream ODL Boron + OVS bump.

Change-Id: Iea330d6d778ff5034e1e801d20fa74485e302a95
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/patches/fuel-plugin-opendaylight/0001-arm64-support-for-OpenDaylight-Fuel-Plugin.patch b/patches/fuel-plugin-opendaylight/0001-arm64-support-for-OpenDaylight-Fuel-Plugin.patch
index da7de36..029e979 100644 (file)
--- a/patches/fuel-plugin-opendaylight/0001-arm64-support-for-OpenDaylight-Fuel-Plugin.patch
+++ b/patches/fuel-plugin-opendaylight/0001-arm64-support-for-OpenDaylight-Fuel-Plugin.patch
@@ -144,7 +144,7 @@ index b229757..0979d86 100644
      owner   => 'odl',
      content => template('opendaylight/jetty.xml.erb')
 @@ -71,6 +78,7 @@ class opendaylight::install (
-   Package['opendaylight'] ->
+   Package[$odl_package] ->
    Ini_setting <||> ->
    Firewall <||> ->
 -  File <||> ->

diff --git a/patches/opnfv-fuel/0010-Allow-overriding-ovs-git-info.patch b/patches/opnfv-fuel/0010-Allow-overriding-ovs-git-info.patch
deleted file mode 100644 (file)
index ba09b31..0000000
--- a/patches/opnfv-fuel/0010-Allow-overriding-ovs-git-info.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Mon, 20 Jun 2016 17:49:51 +0200
-Subject: [PATCH] Allow overriding ovs git info.
-
----
- build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk
-index 819379e..97dc4e1 100644
---- a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk
-+++ b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/config.mk
-@@ -7,6 +7,6 @@
- # http://www.apache.org/licenses/LICENSE-2.0
- ##############################################################################
- 
--OVS_NSH_DPDK_BRANCH=fd77b5d48782e67306c3763dc1908f0fb342c51d
--OVS_NSH_DPDK_REPO=https://review.openstack.org/openstack/fuel-plugin-ovs
--OVS_NSH_DPDK_CHANGE=
-+OVS_NSH_DPDK_BRANCH?=fd77b5d48782e67306c3763dc1908f0fb342c51d
-+OVS_NSH_DPDK_REPO?=https://review.openstack.org/openstack/fuel-plugin-ovs
-+OVS_NSH_DPDK_CHANGE?=

diff --git a/patches/opnfv-fuel/0012-yardstick-plugin-Allow-overriding-git-info.patch b/patches/opnfv-fuel/0012-yardstick-plugin-Allow-overriding-git-info.patch
deleted file mode 100644 (file)
index 7982512..0000000
--- a/patches/opnfv-fuel/0012-yardstick-plugin-Allow-overriding-git-info.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Tue, 28 Jun 2016 19:06:57 +0200
-Subject: [PATCH] yardstick plugin: Allow overriding git info.
-
----
- build/f_isoroot/f_yardstick-pluginbuild/config.mk | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/build/f_isoroot/f_yardstick-pluginbuild/config.mk b/build/f_isoroot/f_yardstick-pluginbuild/config.mk
-index 36df8f1..f671aa9 100644
---- a/build/f_isoroot/f_yardstick-pluginbuild/config.mk
-+++ b/build/f_isoroot/f_yardstick-pluginbuild/config.mk
-@@ -8,6 +8,6 @@
- # http://www.apache.org/licenses/LICENSE-2.0
- ##############################################################################
- 
--YARDSTICK_BRANCH=675eef731a098f83aa98c2021b151b7e5ba1da7d
--YARDSTICK_REPO=https://gerrit.opnfv.org/gerrit/yardstick.git
--YARDSTICK_CHANGE=
-+YARDSTICK_BRANCH?=675eef731a098f83aa98c2021b151b7e5ba1da7d
-+YARDSTICK_REPO?=https://gerrit.opnfv.org/gerrit/yardstick.git
-+YARDSTICK_CHANGE?=

diff --git a/patches/opnfv-fuel/0014-vsperf-plugin-Allow-overriding-git-info.patch b/patches/opnfv-fuel/0014-vsperf-plugin-Allow-overriding-git-info.patch
deleted file mode 100644 (file)
index d82aa0f..0000000
--- a/patches/opnfv-fuel/0014-vsperf-plugin-Allow-overriding-git-info.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Tue, 28 Jun 2016 20:42:58 +0200
-Subject: [PATCH] vsperf plugin: Allow overriding git info.
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- build/f_isoroot/f_vsperfpluginbuild/config.mk | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/build/f_isoroot/f_vsperfpluginbuild/config.mk b/build/f_isoroot/f_vsperfpluginbuild/config.mk
-index 1bf1ef0..576018d 100644
---- a/build/f_isoroot/f_vsperfpluginbuild/config.mk
-+++ b/build/f_isoroot/f_vsperfpluginbuild/config.mk
-@@ -7,6 +7,6 @@
- # http://www.apache.org/licenses/LICENSE-2.0
- ##############################################################################
- 
--VSPERF_BRANCH=5e3b6ae0427963520357453728411327ac8efafe
--VSPERF_REPO=https://gerrit.opnfv.org/gerrit/vswitchperf.git
--VSPERF_CHANGE=
-+VSPERF_BRANCH?=5e3b6ae0427963520357453728411327ac8efafe
-+VSPERF_REPO?=https://gerrit.opnfv.org/gerrit/vswitchperf.git
-+VSPERF_CHANGE?=