diff options
| author |   Alex Yang <yangyang1@zte.com.cn> | 2017-08-04 07:47:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-04 07:47:09 +0000 |
| commit | 6cea4aaddf01fe2c1b6015bc01ea65c6fbba5bcd (patch) | |
| tree | a1657f5f01699eef089a4fa254d22e03bf84c75d /deploy/tempest.py | |
| parent | 5808f4ab29f39ed302068af12c796135b8168da8 (diff) | |
| parent | 49294b55233ec35c384122b11bfcdf3107370a57 (diff) | |
Merge "Support os-odl-nofeature-* as new scenarios"
Diffstat (limited to 'deploy/tempest.py')
| -rw-r--r-- | deploy/tempest.py | 12 |
1 files changed, 8 insertions, 4 deletions
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: |