aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-09-06 16:16:55 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-06 16:16:55 +0000
commit3a81a571f16c536777ef0593b47873031ee3d105 (patch)
treeefaded9632fb711c33d4ecf652281b6bf507959d
parent71025a8f34cf316704625829b5368d7e9211f09f (diff)
parenta87b2d0c07719cf962d57987b1ca129666d12196 (diff)
Merge "Revert "submodule: Kill fuel-astute"" into stable/colorado
-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 ebaa2789..b36db1c9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,3 +34,7 @@
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 ccd3b5f0..d3bc979a 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 844bb3a4..df1bd110 100644
--- 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
+Subproject 65309028c2b65cee68bb865f3895ed185922f3b