aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-09-06 16:17:06 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-06 16:17:06 +0000
commit463bbc0d41c8359712dc7fa3ad49821793042e21 (patch)
treec67dff38777333c3552d173a0e69256580e89a2b
parent213dd734846413af8611591ccb47fe4da8e5f1a1 (diff)
parentdd3449d9fbdd9aabbee09ea1a812f59c25b41a50 (diff)
Merge "Revert "submodule: Kill fuel-astute""
-rw-r--r--.gitmodules4
-rw-r--r--Makefile1
-rw-r--r--patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch5
m---------upstream/fuel-astute0
4 files changed, 9 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 85b4d3f..1fffefb 100644
--- 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 ccd3b5f..d3bc979 100644
--- a/Makefile
+++ b/Makefile
@@ -80,6 +80,7 @@ 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 912efe4..fee234d 100644
--- a/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch
+++ b/patches/opnfv-fuel/0043-build-Add-armband.mk-config.patch
@@ -49,7 +49,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
@@ -74,6 +74,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
+Subproject 65309028c2b65cee68bb865f3895ed185922f3b