Update for fuel10 onos plugin

Change-Id: Ie7e9b5c16505223616bc6d796ce8de60236d098c
Signed-off-by: rssaravana <saravanakumar.somaskandan@huawei.com>

diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile
index 29ab0f7..0e203bb 100644 (file)
--- 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 19d9d00..5f47804 100644 (file)
--- 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 16f7531..8ff9c83 100644 (file)
--- 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 f813458..7fd3fc6 100644 (file)
--- 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 f5c00f0..962b597 100644 (file)
--- 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