aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordongfeng <albert.dongfeng@huawei.com>2016-02-01 07:34:49 -0500
committerJonas Bjurel <jonas.bjurel@ericsson.com>2016-02-01 15:09:41 +0000
commit52d65dff3d183f4405c8fd38c6730f86d0732ca6 (patch)
tree0678c69b2eefe24a1139bffcc7c219ee61a72781
parent59e6a9590eacf058339d7b6154f7665c83f18e9a (diff)
onos change scenario
Change-Id: Iaaa36203e826e1785489538f06ea1a25da373945 (cherry picked from commit dfecc5ca877e322b7a766eb4e22ea27ff76a1ddc)
-rw-r--r--deploy/scenario/ha_onos_heat_ceilometer_scenario_0.0.5.yaml100
-rw-r--r--deploy/scenario/no-ha_onos_heat_ceilometer_scenario_0.0.4.yaml77
-rw-r--r--deploy/scenario/scenario.yaml4
3 files changed, 179 insertions, 2 deletions
diff --git a/deploy/scenario/ha_onos_heat_ceilometer_scenario_0.0.5.yaml b/deploy/scenario/ha_onos_heat_ceilometer_scenario_0.0.5.yaml
new file mode 100644
index 000000000..a94f48b87
--- /dev/null
+++ b/deploy/scenario/ha_onos_heat_ceilometer_scenario_0.0.5.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.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
+# <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.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/no-ha_onos_heat_ceilometer_scenario_0.0.4.yaml b/deploy/scenario/no-ha_onos_heat_ceilometer_scenario_0.0.4.yaml
new file mode 100644
index 000000000..f8c705ff6
--- /dev/null
+++ b/deploy/scenario/no-ha_onos_heat_ceilometer_scenario_0.0.4.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.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
+# <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.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/scenario.yaml b/deploy/scenario/scenario.yaml
index 0a13be576..f6fac6632 100644
--- a/deploy/scenario/scenario.yaml
+++ b/deploy/scenario/scenario.yaml
@@ -51,10 +51,10 @@ os-odl_l2-nofeature-noha:
configfile: no-ha_odl-l2_heat_ceilometer_scenario_0.0.2.yaml
os-onos-nofeature-ha:
- configfile: ha_onos_heat_ceilometer_scenario_0.0.4.yaml
+ configfile: ha_onos_heat_ceilometer_scenario_0.0.5.yaml
os-onos-nofeature-noha:
- configfile: no-ha_onos_heat_ceilometer_scenario_0.0.3.yaml
+ configfile: no-ha_onos_heat_ceilometer_scenario_0.0.4.yaml
os-nosdn-kvm-ha:
configfile: ha_nfv-kvm_heat_ceilometer_scenario_0.0.3.yaml