diff options
| author |   Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2017-08-04 12:50:09 +0800 |
|---|---|---|
| committer | Zhijiang Hu <hu.zhijiang@zte.com.cn> | 2017-08-04 13:07:06 +0800 |
| commit | 49294b55233ec35c384122b11bfcdf3107370a57 (patch) | |
| tree | d1d5a813223603ceb8cbf63278808703c1f083b8 /deploy/tempest.py | |
| parent | 06b0039222b1a71f1ed7cf7378871d14a5f6b904 (diff) | |
Support os-odl-nofeature-* as new scenarios
Rename all scenarios with "odl_l3" in their name in Euphrates to
just "odl".
Daisy will keep "odl_l3" and "odl_l2" (in code, not for user)
for further reference.
Change-Id: Ib762dd808d4f9467b0e6827b8bbed6d9df7e0e0e
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
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 3c1a6c7d..b154e72d 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: |