submodule: fuel-plugin-ovs.

diff --git a/.gitmodules b/.gitmodules
index 6275a1b..9622293 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -30,3 +30,7 @@
        path = upstream/fuel-nailgun-agent
        url = https://github.com/openstack/fuel-nailgun-agent
        branch = stable/mitaka
+[submodule "fuel-plugin-ovs"]
+       path = upstream/fuel-plugin-ovs
+       url = https://github.com/openstack/fuel-plugin-ovs
+       branch = master

diff --git a/Makefile b/Makefile
index d106df2..9a7f36a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -73,6 +73,8 @@ build:
                        FUEL_MIRROR_REPO=${root}/upstream/fuel-mirror \
                        ODL_REPO=${root}/upstream/fuel-plugin-opendaylight \
                        ODL_CHANGE= \
+                       OVS_NSH_DPDK_REPO=${root}/upstream/fuel-plugin-ovs \
+                       OVS_NSH_DPDK_BRANCH=HEAD \
                        FUELLIB_COMMIT=HEAD \
                        NAILGUN_COMMIT=HEAD \
                        FUEL_AGENT_COMMIT=HEAD \

diff --git a/patches/opnfv-fuel/0010-Allow-overriding-ovs-git-info.patch b/patches/opnfv-fuel/0010-Allow-overriding-ovs-git-info.patch
new file mode 100644 (file)
index 0000000..ba09b31
--- /dev/null
+++ b/patches/opnfv-fuel/0010-Allow-overriding-ovs-git-info.patch
@@ -0,0 +1,22 @@
+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/upstream/fuel-plugin-ovs b/upstream/fuel-plugin-ovs
new file mode 160000 (submodule)
index 0000000..bee1b2b
--- /dev/null
+++ b/upstream/fuel-plugin-ovs
@@ -0,0 +1 @@
+Subproject commit bee1b2b540922f0a1439d3b878480da590f506d8