From cefa3fdadc8c1bd6d8b92c5976f76dbbebc87992 Mon Sep 17 00:00:00 2001 From: Jonas Bjurel <jonas.bjurel@ericsson.com> Date: Sun, 10 Jan 2016 19:31:52 +0100 Subject: ONOS scenario according to wanted config file structure Replaces: - https://gerrit.opnfv.org/gerrit/#/c/5999/ - https://gerrit.opnfv.org/gerrit/#/c/6003/ Description: - Onos scenarios updated with needed dea and dha overrides, no scenario specific information in other config files such dha, dea_base, dea_pod override, etc. - Added a virtual POD for Huawei-china specific needs, i.e. DNS and NTP. - Small fix in deploy-conf.py Change-Id: I85fe2fc4e9ec5fe0bc98ae7b399f2e49af6450f9 Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com> (cherry picked from commit 283bf98d087afd9073632340800e745f5a8d8de2) --- .../ha_onos_heat_ceilometer_scenario_0.0.2.yaml | 173 +++++++++++++++++++++ .../no-ha_onos_heat_ceilometer_scenario_0.0.2.yaml | 150 ++++++++++++++++++ deploy/scenario/scenario.yaml | 4 +- 3 files changed, 325 insertions(+), 2 deletions(-) create mode 100644 deploy/scenario/ha_onos_heat_ceilometer_scenario_0.0.2.yaml create mode 100644 deploy/scenario/no-ha_onos_heat_ceilometer_scenario_0.0.2.yaml (limited to 'deploy/scenario') diff --git a/deploy/scenario/ha_onos_heat_ceilometer_scenario_0.0.2.yaml b/deploy/scenario/ha_onos_heat_ceilometer_scenario_0.0.2.yaml new file mode 100644 index 000000000..df1f1e7a7 --- /dev/null +++ b/deploy/scenario/ha_onos_heat_ceilometer_scenario_0.0.2.yaml @@ -0,0 +1,173 @@ +############################################################################## +# 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.2 + created: Jan 10 2016 + comment: Fuel ONOS HA with Ceph, Ceilometer and Heat + +############################################################################## +# 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 +# <module-config-base-uri>/<module-config-name>_<module-config-version>.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.1 + module-config-override: + # Module config overrides + public_eth: + value: 'eth3' + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +dea-override-config: + environment: + name: onos_ha + mode: ha + net_segment_type: tun + wanted_release: Kilo on Ubuntu 14.04 + nodes: + - id: 1 + interfaces: interfaces_1 + role: mongo,controller,onos + transformations: transformations_1 + - id: 2 + interfaces: interfaces_1 + role: mongo,controller + transformations: transformations_1 + - id: 3 + interfaces: interfaces_1 + role: mongo,controller + transformations: transformations_1 + - id: 4 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_2 + - id: 5 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_2 + +# Unique network transformation for ONOS deployment + transformations_2: + transformations: + - action: add-br + name: br-fw-admin + - action: add-br + name: br-mgmt + - action: add-br + name: br-storage + - action: add-br + name: br-mesh + - action: add-port + bridge: br-fw-admin + name: eth0 + - action: add-port + bridge: br-mgmt + name: eth0.101 + - action: add-port + bridge: br-storage + name: eth1.102 + - action: add-port + bridge: br-mesh + name: eth2.103 + + settings: + editable: + common: + libvirt_type: + # ONOS requires QEMU + value: qemu + public_network_assignment: + assign_to_all_nodes: + # ONOS should not have public network assignment to all nodes + value: false + additional_components: + ceilometer: + description: If selected, Ceilometer component will be installed + label: Install Ceilometer + type: checkbox + value: true + weight: 40 + heat: + description: '' + label: '' + type: hidden + value: true + weight: 30 + metadata: + label: Additional Components + weight: 20 + storage: + ephemeral_ceph: + description: Configures Nova to store ephemeral volumes in RBD. This works + best if Ceph is enabled for volumes and images, too. Enables live migration + of all types of Ceph backed VMs (without this option, live migration will + only work with VMs launched from Cinder volumes). + label: Ceph RBD for ephemeral volumes (Nova) + type: checkbox + value: true + weight: 75 + images_ceph: + description: Configures Glance to use the Ceph RBD backend to store images. + If enabled, this option will prevent Swift from installing. + label: Ceph RBD for images (Glance) + restrictions: + - settings:storage.images_vcenter.value == true: Only one Glance backend could + be selected. + type: checkbox + value: true + weight: 30 + +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_0.0.2.yaml b/deploy/scenario/no-ha_onos_heat_ceilometer_scenario_0.0.2.yaml new file mode 100644 index 000000000..605b46e58 --- /dev/null +++ b/deploy/scenario/no-ha_onos_heat_ceilometer_scenario_0.0.2.yaml @@ -0,0 +1,150 @@ +############################################################################## +# 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.2 + created: Jan 10 2016 + comment: ONOS No HA with Ceph, Ceilometer and Heat + +############################################################################## +# 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 +# <module-config-base-uri>/<module-config-name>_<module-config-version>.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.1 + module-config-override: + # Module config overrides + public_eth: + value: 'eth3' + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +dea-override-config: + environment: + mode: ha + net_segment_type: tun + name: onos_no-ha + + wanted_release: Kilo on Ubuntu 14.04 + nodes: + - id: 1 + interfaces: interfaces_1 + role: mongo,controller,onos + transformations: transformations_1 + - id: 2 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_2 + - id: 3 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_2 + - id: 4 + interfaces: interfaces_1 + role: ceph-osd,compute + transformations: transformations_2 + +# Unique network transformation for ONOS deployment + transformations_2: + transformations: + - action: add-br + name: br-fw-admin + - action: add-br + name: br-mgmt + - action: add-br + name: br-storage + - action: add-br + name: br-mesh + - action: add-port + bridge: br-fw-admin + name: eth0 + - action: add-port + bridge: br-mgmt + name: eth0.101 + - action: add-port + bridge: br-storage + name: eth1.102 + - action: add-port + bridge: br-mesh + name: eth2.103 + + settings: + editable: + common: + libvirt_type: + # ONOS requires QEMU + value: qemu + public_network_assignment: + assign_to_all_nodes: + # ONOS should not have public network assignment to all nodes + value: false + additional_components: + ceilometer: + description: If selected, Ceilometer component will be installed + label: Install Ceilometer + type: checkbox + value: true + weight: 40 + heat: + description: '' + label: '' + type: hidden + value: true + weight: 30 + metadata: + label: Additional Components + weight: 20 + storage: + ephemeral_ceph: + description: Configures Nova to store ephemeral volumes in RBD. This works + best if Ceph is enabled for volumes and images, too. Enables live migration + of all types of Ceph backed VMs (without this option, live migration will + only work with VMs launched from Cinder volumes). + label: Ceph RBD for ephemeral volumes (Nova) + type: checkbox + value: true + weight: 75 + images_ceph: + description: Configures Glance to use the Ceph RBD backend to store images. + If enabled, this option will prevent Swift from installing. + label: Ceph RBD for images (Glance) + restrictions: + - settings:storage.images_vcenter.value == true: Only one Glance backend could + be selected. + type: checkbox + value: true + weight: 30 + +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 e978a46d0..1d75b2353 100644 --- a/deploy/scenario/scenario.yaml +++ b/deploy/scenario/scenario.yaml @@ -32,10 +32,10 @@ os_odl-l2_no-ha: configfile: no-ha_odl-l2_heat_ceilometer_scenario_0.0.1.yaml os_onos_ha: - configfile: ha_onos_heat_ceilometer_scenario_0.0.1.yaml + configfile: ha_onos_heat_ceilometer_scenario_0.0.2.yaml os_onos_no-ha: - configfile: no-ha_onos_heat_ceilometer_scenario_0.0.1.yaml + configfile: no-ha_onos_heat_ceilometer_scenario_0.0.2.yaml os_kvm_ha: configfile: ha_nfv-kvm_heat_ceilometer_scenario_0.0.1.yaml -- cgit