Revert "submodule: Kill fuel-astute"

This reverts commit 376c76d05862ed38edeb217cd9480807571491a7.

Change-Id: Ice749599287221af71128ec466894fdb8106d2ec

diff --git a/.gitmodules b/.gitmodules
index 85b4d3f..1fffefb 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,3 +34,7 @@
        path = upstream/vswitchperf
        url = https://gerrit.opnfv.org/gerrit/vswitchperf.git
        branch = master
+[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 f458f0d..d5444cd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -81,6 +81,7 @@ patches-export: submodules-init
 patches-import: submodules-init
        @cd ${FUEL_BASE} && git checkout -q master
        @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 844bb3a..df1bd11 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,51 @@
+@@ -0,0 +1,54 @@
 +##############################################################################
 +# Copyright (c) 2016 Enea AB and others.
 +# Alexandru.Avadanii@enea.com
@@ -76,6 +76,9 @@ 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
new file mode 160000 (submodule)
index 0000000..6530902
--- /dev/null
+++ b/upstream/fuel-astute
@@ -0,0 +1 @@
+Subproject commit 65309028c2b65cee68bb865f3895ed185922f3b2