diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-03-13 21:21:53 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-03-13 21:26:09 +0100 |
| commit | 95c0371e3fe3d515a96d941bf303a853a3f2787b (patch) | |
| tree | cb167a9baff126b2beb2c0bf9a7249bf5cd61174 | |
| parent | 22cbe89a49f5984c5c3d074158d3148581e16107 (diff) | |
Leverage on VOLUME_DEVICE_NAME if Fuel
As Fuel sets VOLUME_DEVICE_NAME [1], the specific conditional
instruction can be removed.
[1] https://build.opnfv.org/ci/job/functest-fuel-baremetal-daily-master/18/console
Change-Id: Iee3fd7c969cf31c8017b73c6ffd646f0e33a9e73
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/conf_utils.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 6121ab970..57a3fcd6c 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -233,12 +233,7 @@ def configure_tempest_update_params(tempest_conf_file, res_dir, rconfig = ConfigParser.RawConfigParser() rconfig.read(tempest_conf_file) rconfig.set('compute', 'fixed_network_name', network_name) - if CI_INSTALLER_TYPE == 'fuel': - # backward compatibility till Fuel jobs set the right env var - rconfig.set('compute', 'volume_device_name', 'vdc') - else: - rconfig.set( - 'compute', 'volume_device_name', env.get('VOLUME_DEVICE_NAME')) + rconfig.set('compute', 'volume_device_name', env.get('VOLUME_DEVICE_NAME')) if image_id is not None: rconfig.set('compute', 'image_ref', image_id) if IMAGE_ID_ALT is not None: |