fuel-plugin-ovs: FIXME: Pin to pre-Newton upstream

Upstream Fuel@OPNFV made the switch to Newton, while in Armband
this will happen later.

Until then, pin the latest Mitaka compatible version, i.e. use
the Fuel@OPNFV reference from the Colorado branch.

While at it, add missing change var for upstream fuel-plugin-ovs
git repo, to prevent issues like ARMBAND-166 from happening on
Armband master later.

JIRA: ARMBAND-166
JIRA: ARMBAND-118

Change-Id: I0630c2349befa3bdfbbb01b4ad401660d8cfd5fe
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/armband-fuel-config.mk b/armband-fuel-config.mk
index a1a48b7..99e57be 100644 (file)
--- a/armband-fuel-config.mk
+++ b/armband-fuel-config.mk
@@ -40,7 +40,8 @@ export FUEL_PLUGIN_ODL_CHANGE      := ${A_OPNFV_TAG}
 export OPNFV_QUAGGE_PACKAGING_REPO := https://github.com/alexandruavadanii/opnfv-quagga-packaging
 
 export OVS_NSH_DPDK_REPO   := ${ARMBAND_BASE}/upstream/fuel-plugin-ovs
-export OVS_NSH_DPDK_BRANCH := ${A_OPNFV_TAG}
+export OVS_NSH_DPDK_BRANCH := opnfv-armband
+export OVS_NSH_DPDK_CHANGE := ${A_OPNFV_TAG}
 
 export VSPERF_REPO   := ${ARMBAND_BASE}/upstream/vswitchperf
 export VSPERF_BRANCH := opnfv-armband