X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=armband-fuel-config.mk;h=50db8464b2311877fd42ef96b9b9f19afd38b52a;hb=8d3f0770c0ea96771550d2cca3eb169039025900;hp=aceafd3afdafa43024078495d0c3b587b4a1ada8;hpb=e42a9b3011f96ad26f4a19db77ac44cad31a4290;p=armband.git

diff --git a/armband-fuel-config.mk b/armband-fuel-config.mk
index aceafd3a..50db8464 100644
--- a/armband-fuel-config.mk
+++ b/armband-fuel-config.mk
@@ -22,25 +22,16 @@ 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_odlpluginbuild f_bgpvpn-pluginbuild f_ovs-nsh-dpdk-pluginbuild f_tacker-pluginbuild f_yardstick-pluginbuild
-export PLUGINS           := f_yardstick-pluginbuild f_congress-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
 export FUEL_PLUGIN_ODL_CHANGE      := ${A_OPNFV_TAG}
-# FIXME(alav): rebase to Newton and update ref
-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 := opnfv-armband