submodule: Kill fuel-astute

Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 376c76d05862ed38edeb217cd9480807571491a7)

Change-Id: I376c76d05862ed38edeb217cd9480807571491a7

diff --git a/.gitmodules b/.gitmodules
index b36db1c..ebaa278 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,7 +34,3 @@
        path = upstream/vswitchperf
        url = https://gerrit.opnfv.org/gerrit/vswitchperf.git
        branch = stable/colorado
-[submodule "fuel-astute"]
-       path = upstream/fuel-astute
-       url = https://github.com/openstack/fuel-astute.git
-       branch = stable/mitaka

diff --git a/Makefile b/Makefile
index d3bc979..ccd3b5f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,6 @@ patches-export: submodules-init
 .PHONY: patches-import
 patches-import: submodules-init
        @cd ${SUBMOD_DIR}/fuel-agent && git checkout -q ${FUEL_AGENT_COMMIT}
-       @cd ${SUBMOD_DIR}/fuel-astute && git checkout -q ${ASTUTE_COMMIT}
        @cd ${SUBMOD_DIR}/fuel-library && git checkout -q ${FUELLIB_COMMIT}
        @cd ${SUBMOD_DIR}/fuel-mirror && git checkout -q ${FUEL_MIRROR_COMMIT}
        @cd ${SUBMOD_DIR}/fuel-nailgun-agent && \

diff --git a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch
index df1bd11..844bb3a 100644 (file)
--- a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch
+++ b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch
@@ -51,7 +51,7 @@ new file mode 100644
 index 0000000..1e772f0
 --- /dev/null
 +++ b/build/armband.mk
-@@ -0,0 +1,54 @@
+@@ -0,0 +1,51 @@
 +##############################################################################
 +# Copyright (c) 2016 Enea AB and others.
 +# Alexandru.Avadanii@enea.com
@@ -76,9 +76,6 @@ index 0000000..1e772f0
 +    export FPB_CHANGE    := refs/changes/31/311031/2
 +
 +    # Armband git submodules for Fuel/OPNFV components
-+    export ASTUTE_REPO   := ${ARMBAND_BASE}/upstream/fuel-astute
-+    export ASTUTE_COMMIT := HEAD
-+
 +    export NAILGUN_REPO   := ${ARMBAND_BASE}/upstream/fuel-web
 +    export NAILGUN_COMMIT := HEAD
 +

diff --git a/upstream/fuel-astute b/upstream/fuel-astute
deleted file mode 160000 (submodule)
index 6530902..0000000
--- a/upstream/fuel-astute
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 65309028c2b65cee68bb865f3895ed185922f3b2