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>

diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index 6121ab9..57a3fcd 100644 (file)
--- 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: