summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/deploy/deploy.sh3
-rw-r--r--deploy/scenario/ha_odl_nofeature_scenario.yaml50
-rw-r--r--deploy/scenario/no-ha_odl_nofeature_scenario.yaml46
-rw-r--r--deploy/scenario/scenario.yaml10
-rw-r--r--deploy/tempest.py12
-rw-r--r--deploy/utils.py4
6 files changed, 118 insertions, 7 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index bfe0f6fa..31382623 100755
--- a/ci/deploy/deploy.sh
+++ b/ci/deploy/deploy.sh
@@ -64,7 +64,8 @@ DRY_RUN=0
IS_BARE=1
VM_MULTINODE=("computer01" "computer02" "controller02" "controller03" "controller01")
VALID_DEPLOY_SCENARIO=("os-nosdn-nofeature-noha" "os-nosdn-nofeature-ha" "os-odl_l3-nofeature-noha"
- "os-odl_l2-nofeature-noha" "os-odl_l3-nofeature-ha" "os-odl_l2-nofeature-ha")
+ "os-odl_l2-nofeature-noha" "os-odl_l3-nofeature-ha" "os-odl_l2-nofeature-ha"
+ "os-odl-nofeature-noha" "os-odl-nofeature-ha")
#
# END of variables to customize
diff --git a/deploy/scenario/ha_odl_nofeature_scenario.yaml b/deploy/scenario/ha_odl_nofeature_scenario.yaml
new file mode 100644
index 00000000..59e16c4f
--- /dev/null
+++ b/deploy/scenario/ha_odl_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_odl_nofeature_scenario.yaml b/deploy/scenario/no-ha_odl_nofeature_scenario.yaml
new file mode 100644
index 00000000..e91acc6f
--- /dev/null
+++ b/deploy/scenario/no-ha_odl_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
index 81862485..1b04549a 100644
--- a/deploy/scenario/scenario.yaml
+++ b/deploy/scenario/scenario.yaml
@@ -13,6 +13,8 @@
# controler: nosdn|odl|onos|ocl|...
# feaure: nofeature | [vlan]_[kvm]_[ovs]_[vlan]_....
# mode: ha|noha
+# NOTE: os-odl-nofeature-noha = os-odl_l3-nofeature-noha
+# os-odl-nofeature-ha = os-odl_l3-nofeature-ha
##############################################################################
os-nosdn-nofeature-ha:
@@ -31,4 +33,10 @@ 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
+ configfile: no-ha_odl-l2_nofeature_scenario.yaml
+
+os-odl-nofeature-ha:
+ configfile: ha_odl_nofeature_scenario.yaml
+
+os-odl-nofeature-noha:
+ configfile: no-ha_odl_nofeature_scenario.yaml
diff --git a/deploy/tempest.py b/deploy/tempest.py
index 49fc08fb..f9f9e978 100644
--- a/deploy/tempest.py
+++ b/deploy/tempest.py
@@ -103,10 +103,14 @@ def prepare_install():
protocol_type = None
enable_cinder_backend(cluster_id, service_name,
ceph_disk_name, protocol_type)
- if 'scenario' in conf and 'odl_l3' in conf['scenario']:
- enable_opendaylight(cluster_id, 'odl_l3')
- elif 'scenario' in conf and 'odl_l2' in conf['scenario']:
- enable_opendaylight(cluster_id, 'odl_l2')
+
+ if 'scenario' in conf:
+ if 'odl_l3' in conf['scenario'] or \
+ 'odl' in conf['scenario']:
+ enable_opendaylight(cluster_id, 'odl_l3')
+ elif 'odl_l2' in conf['scenario']:
+ enable_opendaylight(cluster_id, 'odl_l2')
+
if not isbare:
install_os_for_vm_step1(cluster_id)
else:
diff --git a/deploy/utils.py b/deploy/utils.py
index bb5535fc..55fbc53a 100644
--- a/deploy/utils.py
+++ b/deploy/utils.py
@@ -24,7 +24,9 @@ valid_scenario_list = ['os-nosdn-nofeature-noha',
'os-odl_l2-nofeature-noha',
'os-nosdn-nofeature-ha',
'os-odl_l3-nofeature-ha',
- 'os-odl_l2-nofeature-ha']
+ 'os-odl_l2-nofeature-ha',
+ 'os-odl-nofeature-noha',
+ 'os-odl-nofeature-ha']
def get_logger():