diff options
| -rw-r--r-- | build/f_isoroot/Makefile | 2 | ||||
| -rw-r--r-- | build/f_isoroot/f_onosfwpluginbuild/config.mk | 2 | ||||
| -rw-r--r-- | deploy/config/plugins/fuel-onos_0.0.3.yaml | 38 | ||||
| -rw-r--r-- | deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml (renamed from deploy/scenario/ha_onos_heat_ceilometer_scenario.yaml) | 8 | ||||
| -rw-r--r-- | deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml (renamed from deploy/scenario/no-ha_onos_heat_ceilometer_scenario.yaml) | 8 | ||||
| -rw-r--r-- | deploy/scenario/scenario.yaml | 8 |
6 files changed, 52 insertions, 14 deletions
diff --git a/build/f_isoroot/Makefile b/build/f_isoroot/Makefile index 862c2dbb8..3a080a09c 100644 --- a/build/f_isoroot/Makefile +++ b/build/f_isoroot/Makefile @@ -11,7 +11,7 @@ # 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_vsperfpluginbuild +PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_vsperfpluginbuild #PLUGINS = f_odlpluginbuild f_onosfwpluginbuild f_ovsnfv-dpdk-pluginbuild f_vsperfpluginbuild f_qemupluginbuild f_ovs-nsh-dpdk-pluginbuild f_bgpvpn-pluginbuild export PLUGINS #NON_8-0_REBASED_PLUGINS = f_bgpvpn-pluginbuild diff --git a/build/f_isoroot/f_onosfwpluginbuild/config.mk b/build/f_isoroot/f_onosfwpluginbuild/config.mk index f521b821b..19d9d00d0 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=Liberty +ONOS_BRANCH=Mitaka 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 new file mode 100644 index 000000000..16f753144 --- /dev/null +++ b/deploy/config/plugins/fuel-onos_0.0.3.yaml @@ -0,0 +1,38 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# jonas.bjurel@ericsson.com +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +plugin-config-metadata: + title: ONOS fuel Plugin configuration template + version: 0.3 + created: Wed Jun 8 2016 + comment: add sfc feature + +onos: + metadata: + # chosen_id: Assigned during installation + class: plugin + default: false + enabled: true + label: onos plugin + toggleable: true + versions: + - enable_sfc: + label: SFC features + type: checkbox + value: true + weight: 13 + metadata: + hot_pluggable: false + # plugin_id: Assigned during installation + plugin_version: 0.9.0 + restrictions: + - cluster:net_provider != 'neutron': Neutron only + - settings:public_network_assignment.assign_to_all_nodes.value == false: Assign + public network to all nodes + weight: 70 diff --git a/deploy/scenario/ha_onos_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml index a94f48b87..e9dd0e196 100644 --- a/deploy/scenario/ha_onos_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml @@ -22,9 +22,9 @@ # deployment configuration meta-data deployment-scenario-metadata: title: ONOS HA deployment - version: 0.0.5 - created: Feb 1 2016 - comment: Rebased to Fuel8 + version: 0.0.6 + created: Jun 08 2016 + comment: Rebased to Fuel9 ############################################################################## # Stack extentions are opnfv added value features in form of a fuel-plugin @@ -34,7 +34,7 @@ deployment-scenario-metadata: stack-extensions: - module: onos module-config-name: fuel-onos - module-config-version: 0.0.2 + module-config-version: 0.0.3 module-config-override: ############################################################################## diff --git a/deploy/scenario/no-ha_onos_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml index f8c705ff6..80d73b335 100644 --- a/deploy/scenario/no-ha_onos_heat_ceilometer_scenario.yaml +++ b/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml @@ -22,9 +22,9 @@ # deployment configuration meta-data deployment-scenario-metadata: title: ONOS No-HA deployment - version: 0.0.4 - created: Feb 1 2016 - comment: ONOS No HA with Ceph, Ceilometer and Heat - Rebased for Fuel8 + version: 0.0.5 + created: Jun 08 2016 + comment: ONOS No HA with Ceph, Ceilometer and Heat - Rebased for Fuel9 ############################################################################## # Stack extentions are opnfv added value features in form of a fuel-plugin @@ -34,7 +34,7 @@ deployment-scenario-metadata: stack-extensions: - module: onos module-config-name: fuel-onos - module-config-version: 0.0.2 + module-config-version: 0.0.3 module-config-override: ############################################################################## diff --git a/deploy/scenario/scenario.yaml b/deploy/scenario/scenario.yaml index 5770cdeaf..fe1660616 100644 --- a/deploy/scenario/scenario.yaml +++ b/deploy/scenario/scenario.yaml @@ -46,11 +46,11 @@ os-odl_l2-nofeature-ha: os-odl_l2-nofeature-noha: configfile: no-ha_odl-l2_heat_ceilometer_scenario.yaml -os-onos-nofeature-ha: - configfile: ha_onos_heat_ceilometer_scenario.yaml +os-onos-sfc-ha: + configfile: ha_onos_sfc_heat_ceilometer_scenario.yaml -os-onos-nofeature-noha: - configfile: no-ha_onos_heat_ceilometer_scenario.yaml +os-onos-sfc-noha: + configfile: no-ha_onos_sfc_heat_ceilometer_scenario.yaml os-nosdn-kvm-ha: configfile: ha_nfv-kvm_heat_ceilometer_scenario.yaml |