summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-03-20 13:08:10 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-20 13:08:10 +0000
commite702ffe67578ff156b9876ab05f684fee896ada7 (patch)
treece1dc13db8e64538127b0eda404ded6d35220c75
parent7534ca18ce7e5f2d969d17a8f9d6043210c35c8d (diff)
parentb6df64e07ab83dbd3be127c48cbb6e0d0b2e4008 (diff)
Merge "Update for fuel10 onos plugin"
-rw-r--r--build/f_isoroot/Makefile6
-rw-r--r--build/f_isoroot/f_onosfwpluginbuild/config.mk2
-rw-r--r--deploy/config/plugins/fuel-onos_0.0.3.yaml2
-rw-r--r--deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml2
-rw-r--r--deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml2
5 files changed, 6 insertions, 8 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
diff --git a/deploy/config/plugins/fuel-onos_0.0.3.yaml b/deploy/config/plugins/fuel-onos_0.0.3.yaml
index 16f753144..8ff9c8323 100644
--- a/deploy/config/plugins/fuel-onos_0.0.3.yaml
+++ b/deploy/config/plugins/fuel-onos_0.0.3.yaml
@@ -30,7 +30,7 @@ onos:
metadata:
hot_pluggable: false
# plugin_id: Assigned during installation
- plugin_version: 0.9.0
+ plugin_version: 0.10.2
restrictions:
- cluster:net_provider != 'neutron': Neutron only
- settings:public_network_assignment.assign_to_all_nodes.value == false: Assign
diff --git a/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml
index f813458d0..7fd3fc640 100644
--- a/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/ha_onos_nofeature_heat_ceilometer_scenario.yaml
@@ -50,7 +50,7 @@ stack-extensions:
weight: 13
metadata:
hot_pluggable: false
- plugin_version: 0.9.0
+ plugin_version: 0.10.2
restrictions:
- cluster:net_provider != 'neutron': Neutron only
- settings:public_network_assignment.assign_to_all_nodes.value == false: Assign
diff --git a/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml
index f5c00f0c9..962b59701 100644
--- a/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml
+++ b/deploy/scenario/no-ha_onos_nofeature_heat_ceilometer_scenario.yaml
@@ -50,7 +50,7 @@ stack-extensions:
weight: 13
metadata:
hot_pluggable: false
- plugin_version: 0.9.0
+ plugin_version: 0.10.2
restrictions:
- cluster:net_provider != 'neutron': Neutron only
- settings:public_network_assignment.assign_to_all_nodes.value == false: Assign