aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-04-29 19:33:22 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-05-02 17:32:48 +0200
commit1158f729444aa16313e263b468e92555f8eb7eb4 (patch)
tree2062e3fccedf0cd94eb1f2684f000d4342314a9a
parent883f2de790b3ff199e6867426a9fc5c48cda50f1 (diff)
Cleanup: Kill submodule: fuel-plugin-ovsnfv.
Change-Id: If1895891c28b7d8d8d109539357475ac578bfc38 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> Conflicts: upstream/fuel-plugin-ovsnfv
-rw-r--r--.gitmodules4
-rw-r--r--Makefile2
m---------upstream/fuel-plugin-ovsnfv0
3 files changed, 0 insertions, 6 deletions
diff --git a/.gitmodules b/.gitmodules
index 801e386..5124f69 100644
--- 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
--- 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
-Subproject 9ad9481eab750f610ee3d2f8eb3e385667ba9fa