Cleanup: Kill submodule: fuel-plugin-ovsnfv.

Change-Id: If1895891c28b7d8d8d109539357475ac578bfc38
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Conflicts:
	upstream/fuel-plugin-ovsnfv

diff --git a/.gitmodules b/.gitmodules
index 801e386..5124f69 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,10 +22,6 @@
        path = upstream/fuel-mirror
        url = https://github.com/openstack/fuel-mirror.git
        branch = stable/8.0
-[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 27215be..1e123a8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -64,7 +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 \
-                       OVSNFV_DPDK_REPO=${root}/upstream/fuel-plugin-ovsnfv \
                        ODL_REPO=${root}/upstream/fuel-plugin-opendaylight \
                        ODL_CHANGE= \
                        FUELLIB_COMMIT=HEAD \
@@ -72,7 +71,6 @@ build:
                        FUEL_AGENT_COMMIT=HEAD \
                        FUEL_NAILGUN_AGENT_COMMIT=HEAD \
                        FUEL_MIRROR_COMMIT=HEAD \
-                       OVSNFV_DPDK_BRANCH=armband-workbench \
                        ODL_BRANCH=armband-workbench \
                        PRODUCT_VERSION=8.0 \
                        PRODUCT_NAME=mos \

diff --git a/upstream/fuel-plugin-ovsnfv b/upstream/fuel-plugin-ovsnfv
deleted file mode 160000 (submodule)
index 9ad9481..0000000
--- a/upstream/fuel-plugin-ovsnfv
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9ad9481eab750f610ee3d2f8eb3e385667ba9fad