From 8b192597ef66f45a820886bfe2489548a9fa807f Mon Sep 17 00:00:00 2001 From: wuwb1989 Date: Wed, 8 Jun 2016 11:42:31 +0800 Subject: build and deploy onos plugin for fuel9 Change-Id: I04dd8b4bdddc5678b158d7287c6ffc52d1bce135 Signed-off-by: wuwb1989 --- build/f_isoroot/Makefile | 2 +- build/f_isoroot/f_onosfwpluginbuild/config.mk | 2 +- deploy/config/plugins/fuel-onos_0.0.3.yaml | 38 ++++++++ .../scenario/ha_onos_heat_ceilometer_scenario.yaml | 100 --------------------- .../ha_onos_sfc_heat_ceilometer_scenario.yaml | 100 +++++++++++++++++++++ .../no-ha_onos_heat_ceilometer_scenario.yaml | 77 ---------------- .../no-ha_onos_sfc_heat_ceilometer_scenario.yaml | 77 ++++++++++++++++ deploy/scenario/scenario.yaml | 8 +- 8 files changed, 221 insertions(+), 183 deletions(-) create mode 100644 deploy/config/plugins/fuel-onos_0.0.3.yaml delete mode 100644 deploy/scenario/ha_onos_heat_ceilometer_scenario.yaml create mode 100644 deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml delete mode 100644 deploy/scenario/no-ha_onos_heat_ceilometer_scenario.yaml create mode 100644 deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml 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_heat_ceilometer_scenario.yaml deleted file mode 100644 index a94f48b87..000000000 --- a/deploy/scenario/ha_onos_heat_ceilometer_scenario.yaml +++ /dev/null @@ -1,100 +0,0 @@ -############################################################################## -# 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 -############################################################################## - -############################################################################### # Description: -# This .yaml configuration file defines the configuration of the fuel -# deployment and is passed as an argument to deploy.sh -# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config -# This will make build.sh fetch this configuration file and configure the -# deployment accordingly. -# After the deployment, a copy of this file gets uploaded to fuel: -# /root/deploy-config.yaml, as well as the sha-1 sum of this file: -# /root/deploy-config.sha1 -############################################################################## - -############################################################################## -# deployment configuration meta-data -deployment-scenario-metadata: - title: ONOS HA deployment - version: 0.0.5 - created: Feb 1 2016 - comment: Rebased to Fuel8 - -############################################################################## -# Stack extentions are opnfv added value features in form of a fuel-plugin -# plug-ins listed below will be enabled and configured according to the -# /_.yaml -# It does so by copying the config file to the local plugin config directory -stack-extensions: - - module: onos - module-config-name: fuel-onos - module-config-version: 0.0.2 - module-config-override: - -############################################################################## -# By editing the override-config sections below, you can override arbitrary -# configuration name-space settings -dea-override-config: - environment: - net_segment_type: tun - nodes: - - id: 1 - interfaces: interfaces_1 - role: controller,onos - transformations: transformations_1 - - id: 2 - interfaces: interfaces_1 - role: mongo,controller - transformations: transformations_1 - - id: 3 - interfaces: interfaces_1 - role: ceph-osd,controller - transformations: transformations_1 - - id: 4 - interfaces: interfaces_1 - role: ceph-osd,compute - transformations: transformations_1 - - id: 5 - interfaces: interfaces_1 - role: ceph-osd,compute - transformations: transformations_1 - settings: - editable: - public_network_assignment: - assign_to_all_nodes: - value: true -dha-override-config: - nodes: - - id: 1 - libvirtName: controller1 - libvirtTemplate: templates/virtual_environment/vms/controller.xml - - id: 2 - libvirtName: controller2 - libvirtTemplate: templates/virtual_environment/vms/controller.xml - - id: 3 - libvirtName: controller3 - libvirtTemplate: templates/virtual_environment/vms/controller.xml - - id: 4 - libvirtName: compute1 - libvirtTemplate: templates/virtual_environment/vms/compute.xml - - id: 5 - libvirtName: compute2 - libvirtTemplate: templates/virtual_environment/vms/compute.xml - - id: 6 - libvirtName: fuel-master - libvirtTemplate: templates/virtual_environment/vms/fuel.xml - isFuel: yes - username: root - password: r00tme - -############################################################################## -# The verification pipeline may populate the section below with arbitrary -# testing information, which post deploy can be retreived from the fuel master: -# /root/deploy-config.yaml -test: diff --git a/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml new file mode 100644 index 000000000..e9dd0e196 --- /dev/null +++ b/deploy/scenario/ha_onos_sfc_heat_ceilometer_scenario.yaml @@ -0,0 +1,100 @@ +############################################################################## +# 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 +############################################################################## + +############################################################################### # Description: +# This .yaml configuration file defines the configuration of the fuel +# deployment and is passed as an argument to deploy.sh +# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config +# This will make build.sh fetch this configuration file and configure the +# deployment accordingly. +# After the deployment, a copy of this file gets uploaded to fuel: +# /root/deploy-config.yaml, as well as the sha-1 sum of this file: +# /root/deploy-config.sha1 +############################################################################## + +############################################################################## +# deployment configuration meta-data +deployment-scenario-metadata: + title: ONOS HA deployment + 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 +# plug-ins listed below will be enabled and configured according to the +# /_.yaml +# It does so by copying the config file to the local plugin config directory +stack-extensions: + - module: onos + module-config-name: fuel-onos + module-config-version: 0.0.3 + module-config-override: + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +dea-override-config: + environment: + net_segment_type: tun + nodes: + - id: 1 + interfaces: interfaces_1 + role: controller,onos + transformations: transformations_1 + - id: 2 + interfaces: interfaces_1 + role: mongo,controller + transformations: transformations_1 + - id: 3 + interfaces: interfaces_1 + role: ceph-osd,controller + transformations: transformations_1 + - id: 4 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 5 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + settings: + editable: + public_network_assignment: + assign_to_all_nodes: + value: true +dha-override-config: + nodes: + - id: 1 + libvirtName: controller1 + libvirtTemplate: templates/virtual_environment/vms/controller.xml + - id: 2 + libvirtName: controller2 + libvirtTemplate: templates/virtual_environment/vms/controller.xml + - id: 3 + libvirtName: controller3 + libvirtTemplate: templates/virtual_environment/vms/controller.xml + - id: 4 + libvirtName: compute1 + libvirtTemplate: templates/virtual_environment/vms/compute.xml + - id: 5 + libvirtName: compute2 + libvirtTemplate: templates/virtual_environment/vms/compute.xml + - id: 6 + libvirtName: fuel-master + libvirtTemplate: templates/virtual_environment/vms/fuel.xml + isFuel: yes + username: root + password: r00tme + +############################################################################## +# The verification pipeline may populate the section below with arbitrary +# testing information, which post deploy can be retreived from the fuel master: +# /root/deploy-config.yaml +test: diff --git a/deploy/scenario/no-ha_onos_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_onos_heat_ceilometer_scenario.yaml deleted file mode 100644 index f8c705ff6..000000000 --- a/deploy/scenario/no-ha_onos_heat_ceilometer_scenario.yaml +++ /dev/null @@ -1,77 +0,0 @@ -############################################################################## -# 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 -############################################################################## - -############################################################################### # Description: -# This .yaml configuration file defines the configuration of the fuel -# deployment and is passed as an argument to deploy.sh -# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config -# This will make build.sh fetch this configuration file and configure the -# deployment accordingly. -# After the deployment, a copy of this file gets uploaded to fuel: -# /root/deploy-config.yaml, as well as the sha-1 sum of this file: -# /root/deploy-config.sha1 -############################################################################## - -############################################################################## -# 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 - -############################################################################## -# Stack extentions are opnfv added value features in form of a fuel-plugin -# plug-ins listed below will be enabled and configured according to the -# /_.yaml -# It does so by copying the config file to the local plugin config directory -stack-extensions: - - module: onos - module-config-name: fuel-onos - module-config-version: 0.0.2 - module-config-override: - -############################################################################## -# By editing the override-config sections below, you can override arbitrary -# configuration name-space settings -dea-override-config: - environment: - net_segment_type: tun - name: onos_no-ha - nodes: - - id: 1 - interfaces: interfaces_1 - role: mongo,controller,onos - transformations: transformations_1 - - id: 2 - interfaces: interfaces_1 - role: ceph-osd,compute - transformations: transformations_1 - - id: 3 - interfaces: interfaces_1 - role: ceph-osd,compute - transformations: transformations_1 - - id: 4 - interfaces: interfaces_1 - role: ceph-osd,compute - transformations: transformations_1 - settings: - editable: - public_network_assignment: - assign_to_all_nodes: - value: true -dha-override-config: -# disks: -# contrail: 500G - -############################################################################## -# The verification pipeline may populate the section below with arbitrary -# testing information, which post deploy can be retreived from the fuel master: -# /root/deploy-config.yaml -test: diff --git a/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml b/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml new file mode 100644 index 000000000..80d73b335 --- /dev/null +++ b/deploy/scenario/no-ha_onos_sfc_heat_ceilometer_scenario.yaml @@ -0,0 +1,77 @@ +############################################################################## +# 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 +############################################################################## + +############################################################################### # Description: +# This .yaml configuration file defines the configuration of the fuel +# deployment and is passed as an argument to deploy.sh +# eg. deploy.sh -c https://artifact.opnfv.org/fuel/config +# This will make build.sh fetch this configuration file and configure the +# deployment accordingly. +# After the deployment, a copy of this file gets uploaded to fuel: +# /root/deploy-config.yaml, as well as the sha-1 sum of this file: +# /root/deploy-config.sha1 +############################################################################## + +############################################################################## +# deployment configuration meta-data +deployment-scenario-metadata: + title: ONOS No-HA deployment + 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 +# plug-ins listed below will be enabled and configured according to the +# /_.yaml +# It does so by copying the config file to the local plugin config directory +stack-extensions: + - module: onos + module-config-name: fuel-onos + module-config-version: 0.0.3 + module-config-override: + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +dea-override-config: + environment: + net_segment_type: tun + name: onos_no-ha + nodes: + - id: 1 + interfaces: interfaces_1 + role: mongo,controller,onos + transformations: transformations_1 + - id: 2 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 3 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + - id: 4 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_1 + settings: + editable: + public_network_assignment: + assign_to_all_nodes: + value: true +dha-override-config: +# disks: +# contrail: 500G + +############################################################################## +# The verification pipeline may populate the section below with arbitrary +# testing information, which post deploy can be retreived from the fuel master: +# /root/deploy-config.yaml +test: 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 -- cgit 1.2.3-korg