X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=armband-fuel-config.mk;h=50db8464b2311877fd42ef96b9b9f19afd38b52a;hb=2e922579664feeadf722ce11d4f8b92ffffd3c0c;hp=1cd52bdd38869b54fb92872db1083810fff37f14;hpb=2bde158711c7a93bbe7c03a8967780d31f491f7d;p=armband.git

diff --git a/armband-fuel-config.mk b/armband-fuel-config.mk
index 1cd52bdd..50db8464 100644
--- a/armband-fuel-config.mk
+++ b/armband-fuel-config.mk
@@ -22,19 +22,12 @@ F_SUB_DIR   := ${F_REPOS_DIR}/sub
 ARMBAND_TRACK_REMOTES ?= yes
 
 # Armband plugins, supported archs & specific info
-# FIXME(alav): re-enable for D release after rebasing to Newton
-#export PLUGINS           := f_ovs-nsh-dpdk-pluginbuild f_tacker-pluginbuild
-export PLUGINS           := f_yardstick-pluginbuild f_congress-pluginbuild f_odlpluginbuild f_bgpvpn-pluginbuild
+export PLUGINS           := f_yardstick-pluginbuild f_congress-pluginbuild f_odlpluginbuild f_bgpvpn-pluginbuild f_ovs-nsh-dpdk-pluginbuild f_tacker-pluginbuild
 export UBUNTU_ARCH       := amd64 arm64
 export PRODNO            := OPNFV_A_FUEL
 export MIRROR_MOS_UBUNTU := linux.enea.com
 export EXTRA_RPM_REPOS   := armband,http://linux.enea.com/mos-repos/centos/mos10.0-centos7/armband/x86_64,10
 
-# Temporary fuel-plugin-builder repo info for runtime patching
-export FPB_REPO      := https://github.com/openstack/fuel-plugins
-export FPB_BRANCH    := master
-export FPB_CHANGE    := refs/changes/31/311031/2
-
 # Armband git submodules for Fuel/OPNFV components
 export FUEL_PLUGIN_ODL_REPO        := ${ARMBAND_BASE}/upstream/fuel-plugin-opendaylight
 export FUEL_PLUGIN_ODL_BRANCH      := opnfv-armband