From ccd2fe6cd04ed5e9a622a51d37bb1f0d97fc633b Mon Sep 17 00:00:00 2001 From: zhongjun Date: Thu, 22 Jun 2017 10:31:14 +0800 Subject: add the scenarios option Add the scenarios option and yaml configuration files, currently only support three scenarios as below. os-nosdn-nofeature-noha/os-odl_l3-nofeature-noha/ os-odl_l2-nofeature-noha. we will support more secnarios such as os-odl_l3-nofeature-ha in future. Change-Id: I24d7875208e277f6ee1b794c0033d5fee6b5e371 Signed-off-by: zhongjun --- deploy/scenario/ha_nofeature_scenario.yaml | 46 ++++++++++++++++++++ deploy/scenario/ha_odl-l2_nofeatrue_scenario.yaml | 50 ++++++++++++++++++++++ deploy/scenario/ha_odl-l3_nofeature_scenario.yaml | 50 ++++++++++++++++++++++ deploy/scenario/no-ha_nofeature_scenario.yaml | 42 ++++++++++++++++++ .../scenario/no-ha_odl-l2_nofeature_scenario.yaml | 46 ++++++++++++++++++++ .../scenario/no-ha_odl-l3_nofeature_scenario.yaml | 46 ++++++++++++++++++++ deploy/scenario/scenario.yaml | 34 +++++++++++++++ 7 files changed, 314 insertions(+) create mode 100644 deploy/scenario/ha_nofeature_scenario.yaml create mode 100644 deploy/scenario/ha_odl-l2_nofeatrue_scenario.yaml create mode 100644 deploy/scenario/ha_odl-l3_nofeature_scenario.yaml create mode 100644 deploy/scenario/no-ha_nofeature_scenario.yaml create mode 100644 deploy/scenario/no-ha_odl-l2_nofeature_scenario.yaml create mode 100644 deploy/scenario/no-ha_odl-l3_nofeature_scenario.yaml create mode 100644 deploy/scenario/scenario.yaml (limited to 'deploy/scenario') diff --git a/deploy/scenario/ha_nofeature_scenario.yaml b/deploy/scenario/ha_nofeature_scenario.yaml new file mode 100644 index 00000000..a3791462 --- /dev/null +++ b/deploy/scenario/ha_nofeature_scenario.yaml @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2017 ZTE Coreporation and others. +# hu.zhijiang@zte.com.cn +# sun.jing22@zte.com.cn +# 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 +############################################################################## +############################################################################## +# deployment configuration meta-data +deployment-scenario-metadata: + title: OpenStack-only, HA deploymen + version: 0.0.1 + created: Jun 8 2017 + comment: + +############################################################################## +# Stack extentions are opnfv added value features +stack-extensions: + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +deploy-override-config: + hosts: + - name: 'controller01' + roles: + - 'CONTROLLER_LB' + template: 'templates/virtual_environment/vms/controller.xml' + - name: 'controller02' + roles: + - 'CONTROLLER_LB' + template: 'templates/virtual_environment/vms/controller.xml' + - name: 'controller03' + roles: + - 'CONTROLLER_LB' + template: 'templates/virtual_environment/vms/controller.xml' + - name: 'computer01' + roles: + - 'COMPUTER' + template: 'templates/virtual_environment/vms/computer.xml' + - name: 'computer02' + roles: + - 'COMPUTER' + template: 'templates/virtual_environment/vms/computer.xml' \ No newline at end of file diff --git a/deploy/scenario/ha_odl-l2_nofeatrue_scenario.yaml b/deploy/scenario/ha_odl-l2_nofeatrue_scenario.yaml new file mode 100644 index 00000000..db0287c8 --- /dev/null +++ b/deploy/scenario/ha_odl-l2_nofeatrue_scenario.yaml @@ -0,0 +1,50 @@ +############################################################################## +# Copyright (c) 2017 ZTE Coreporation and others. +# hu.zhijiang@zte.com.cn +# sun.jing22@zte.com.cn +# 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 +############################################################################## +############################################################################## +# deployment configuration meta-data +deployment-scenario-metadata: + title: ODL-L2 HA deployment + version: 0.0.1 + created: Jun 22 2017 + comment: + +############################################################################## +# Stack extentions are opnfv added value features +stack-extensions: + - module: opendaylight + module-config: + - enable_l3_odl: + value: false + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +deploy-override-config: + hosts: + - name: 'controller01' + roles: + - 'CONTROLLER_LB' + template: 'templates/virtual_environment/vms/controller.xml' + - name: 'controller02' + roles: + - 'CONTROLLER_LB' + template: 'templates/virtual_environment/vms/controller.xml' + - name: 'controller03' + roles: + - 'CONTROLLER_LB' + template: 'templates/virtual_environment/vms/controller.xml' + - name: 'computer01' + roles: + - 'COMPUTER' + template: 'templates/virtual_environment/vms/computer.xml' + - name: 'computer02' + roles: + - 'COMPUTER' + template: 'templates/virtual_environment/vms/computer.xml' \ No newline at end of file diff --git a/deploy/scenario/ha_odl-l3_nofeature_scenario.yaml b/deploy/scenario/ha_odl-l3_nofeature_scenario.yaml new file mode 100644 index 00000000..59e16c4f --- /dev/null +++ b/deploy/scenario/ha_odl-l3_nofeature_scenario.yaml @@ -0,0 +1,50 @@ +############################################################################## +# Copyright (c) 2017 ZTE Coreporation and others. +# hu.zhijiang@zte.com.cn +# sun.jing22@zte.com.cn +# 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 +############################################################################## +############################################################################## +# deployment configuration meta-data +deployment-scenario-metadata: + title: ODL-L3 HA deployment + version: 0.0.1 + created: Jun 8 2017 + comment: + +############################################################################## +# Stack extentions are opnfv added value features +stack-extensions: + - module: opendaylight + module-config: + - enable_l3_odl: + value: true + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +deploy-override-config: + hosts: + - name: 'controller01' + roles: + - 'CONTROLLER_LB' + template: 'templates/virtual_environment/vms/controller.xml' + - name: 'controller02' + roles: + - 'CONTROLLER_LB' + template: 'templates/virtual_environment/vms/controller.xml' + - name: 'controller03' + roles: + - 'CONTROLLER_LB' + template: 'templates/virtual_environment/vms/controller.xml' + - name: 'computer01' + roles: + - 'COMPUTER' + template: 'templates/virtual_environment/vms/computer.xml' + - name: 'computer02' + roles: + - 'COMPUTER' + template: 'templates/virtual_environment/vms/computer.xml' \ No newline at end of file diff --git a/deploy/scenario/no-ha_nofeature_scenario.yaml b/deploy/scenario/no-ha_nofeature_scenario.yaml new file mode 100644 index 00000000..f959234b --- /dev/null +++ b/deploy/scenario/no-ha_nofeature_scenario.yaml @@ -0,0 +1,42 @@ +############################################################################## +# Copyright (c) 2017 ZTE Coreporation and others. +# hu.zhijiang@zte.com.cn +# sun.jing22@zte.com.cn +# 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 +############################################################################## +############################################################################## +# deployment configuration meta-data +deployment-scenario-metadata: + title: OpenStack-only, NO-HA deploymen + version: 0.0.1 + created: Jun 8 2017 + comment: + +############################################################################## +# Stack extentions are opnfv added value features +stack-extensions: + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +deploy-override-config: + hosts: + - name: 'controller01' + roles: + - 'CONTROLLER_LB' + template: 'templates/virtual_environment/vms/controller.xml' + - name: 'computer01' + roles: + - 'COMPUTER' + template: 'templates/virtual_environment/vms/computer.xml' + - name: 'computer02' + roles: + - 'COMPUTER' + template: 'templates/virtual_environment/vms/computer.xml' + - name: 'computer03' + roles: + - 'COMPUTER' + template: 'templates/virtual_environment/vms/computer.xml' \ No newline at end of file diff --git a/deploy/scenario/no-ha_odl-l2_nofeature_scenario.yaml b/deploy/scenario/no-ha_odl-l2_nofeature_scenario.yaml new file mode 100644 index 00000000..12cfc748 --- /dev/null +++ b/deploy/scenario/no-ha_odl-l2_nofeature_scenario.yaml @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2017 ZTE Coreporation and others. +# hu.zhijiang@zte.com.cn +# sun.jing22@zte.com.cn +# 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 +############################################################################## +############################################################################## +# deployment configuration meta-data +deployment-scenario-metadata: + title: ODL-L2 NO-HA deployment + version: 0.0.1 + created: Jun 22 2017 + comment: + +############################################################################## +# Stack extentions are opnfv added value features +stack-extensions: + - module: opendaylight + module-config: + - enable_l3_odl: + value: false + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +deploy-override-config: + hosts: + - name: 'controller01' + roles: + - 'CONTROLLER_LB' + template: 'templates/virtual_environment/vms/controller.xml' + - name: 'computer01' + roles: + - 'COMPUTER' + template: 'templates/virtual_environment/vms/computer.xml' + - name: 'computer02' + roles: + - 'COMPUTER' + template: 'templates/virtual_environment/vms/computer.xml' + - name: 'computer03' + roles: + - 'COMPUTER' + template: 'templates/virtual_environment/vms/computer.xml' \ No newline at end of file diff --git a/deploy/scenario/no-ha_odl-l3_nofeature_scenario.yaml b/deploy/scenario/no-ha_odl-l3_nofeature_scenario.yaml new file mode 100644 index 00000000..e91acc6f --- /dev/null +++ b/deploy/scenario/no-ha_odl-l3_nofeature_scenario.yaml @@ -0,0 +1,46 @@ +############################################################################## +# Copyright (c) 2017 ZTE Coreporation and others. +# hu.zhijiang@zte.com.cn +# sun.jing22@zte.com.cn +# 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 +############################################################################## +############################################################################## +# deployment configuration meta-data +deployment-scenario-metadata: + title: ODL-L3 NO-HA deployment + version: 0.0.1 + created: Jun 8 2017 + comment: + +############################################################################## +# Stack extentions are opnfv added value features +stack-extensions: + - module: opendaylight + module-config: + - enable_l3_odl: + value: true + +############################################################################## +# By editing the override-config sections below, you can override arbitrary +# configuration name-space settings +deploy-override-config: + hosts: + - name: 'controller01' + roles: + - 'CONTROLLER_LB' + template: 'templates/virtual_environment/vms/controller.xml' + - name: 'computer01' + roles: + - 'COMPUTER' + template: 'templates/virtual_environment/vms/computer.xml' + - name: 'computer02' + roles: + - 'COMPUTER' + template: 'templates/virtual_environment/vms/computer.xml' + - name: 'computer03' + roles: + - 'COMPUTER' + template: 'templates/virtual_environment/vms/computer.xml' \ No newline at end of file diff --git a/deploy/scenario/scenario.yaml b/deploy/scenario/scenario.yaml new file mode 100644 index 00000000..81862485 --- /dev/null +++ b/deploy/scenario/scenario.yaml @@ -0,0 +1,34 @@ +############################################################################## +# Copyright (c) 2017 ZTE Coreporation and others. +# hu.zhijiang@zte.com.cn +# sun.jing22@zte.com.cn +# 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 +############################################################################## +############################################################################## +# Short scenario name convention to be followed: +# os---[-] +# controler: nosdn|odl|onos|ocl|... +# feaure: nofeature | [vlan]_[kvm]_[ovs]_[vlan]_.... +# mode: ha|noha +############################################################################## + +os-nosdn-nofeature-ha: + configfile: ha_nofeature_scenario.yaml + +os-nosdn-nofeature-noha: + configfile: no-ha_nofeature_scenario.yaml + +os-odl_l3-nofeature-ha: + configfile: ha_odl-l3_nofeature_scenario.yaml + +os-odl_l3-nofeature-noha: + configfile: no-ha_odl-l3_nofeature_scenario.yaml + +os-odl_l2-nofeature-ha: + configfile: ha_odl-l2_nofeature_scenario.yaml + +os-odl_l2-nofeature-noha: + configfile: no-ha_odl-l2_nofeature_scenario.yaml \ No newline at end of file -- cgit 1.2.3-korg