Merge "Fix ssl cert upload path"

[fuel.git] / build / f_isoroot / Makefile

diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index 2a96490..0e203bb 100644 (file)
--- a/build/f_isoroot/Makefile
+++ b/build/f_isoroot/Makefile
@@ -9,17 +9,12 @@
 ##############################################################################
 
 # Add Fuel plugin build targets here
-# Plugins disabled for the Fuel Mitaka uplift. Please re-enable your plugin as you have
-# verified it!
-PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_vsperfpluginbuild f_ovs-nsh-dpdk-pluginbuild f_yardstick-pluginbuild
-#PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_qemupluginbuild f_ovs-nsh-dpdk-pluginbuild f_bgpvpn-pluginbuild
+PLUGINS ?= f_ovs-nsh-dpdk-pluginbuild f_vsperfpluginbuild f_kvm-pluginbuild f_yardstick-pluginbuild f_collectd-ceilometer-pluginbuild f_congress-pluginbuild f_odlpluginbuild f_bgpvpn-pluginbuild f_tacker-pluginbuild f_onosfwpluginbuild
 export PLUGINS
-#NON_8-0_REBASED_PLUGINS = f_bgpvpn-pluginbuild
+
 
 # If the BUILD_FUEL_PLUGINS environment variable is set, only build the plugins
 # indicated therein.
-# Temporarilu disabling f_repobuild that currently have some issues on
-# Fuel Mitaka.
 ifdef BUILD_FUEL_PLUGINS
 export BUILD_FUEL_PLUGINS
 SUBDIRS = f_kscfg f_bootstrap f_isolinux f_repobuild $(BUILD_FUEL_PLUGINS)