diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-03-20 13:08:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-20 13:08:10 +0000 |
| commit | e702ffe67578ff156b9876ab05f684fee896ada7 (patch) | |
| tree | ce1dc13db8e64538127b0eda404ded6d35220c75 /build/f_isoroot | |
| parent | 7534ca18ce7e5f2d969d17a8f9d6043210c35c8d (diff) | |
| parent | b6df64e07ab83dbd3be127c48cbb6e0d0b2e4008 (diff) | |
Merge "Update for fuel10 onos plugin"
Diffstat (limited to 'build/f_isoroot')
| -rw-r--r-- | build/f_isoroot/Makefile | 6 | ||||
| -rw-r--r-- | build/f_isoroot/f_onosfwpluginbuild/config.mk | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile index 29ab0f7c6..0e203bbba 100644 --- a/build/f_isoroot/Makefile +++ b/build/f_isoroot/Makefile @@ -9,11 +9,9 @@ ############################################################################## # Add Fuel plugin build targets here -# Plugins disabled for the Fuel Newton uplift. Please re-enable your plugin as you have -# verified it! -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 +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_10-0_REBASED_PLUGINS = f_onosfwpluginbuild + # If the BUILD_FUEL_PLUGINS environment variable is set, only build the plugins # indicated therein. diff --git a/build/f_isoroot/f_onosfwpluginbuild/config.mk b/build/f_isoroot/f_onosfwpluginbuild/config.mk index 19d9d00d0..5f47804cd 100644 --- a/build/f_isoroot/f_onosfwpluginbuild/config.mk +++ b/build/f_isoroot/f_onosfwpluginbuild/config.mk @@ -7,5 +7,5 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -ONOS_BRANCH=Mitaka +ONOS_BRANCH=master ONOS_REPO=git://git.openstack.org/openstack/fuel-plugin-onos |