Code Review
/
functest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Implement trunk ports testcase"
[functest.git]
/
functest
/
opnfv_tests
/
openstack
/
tempest
/
conf_utils.py
diff --git
a/functest/opnfv_tests/openstack/tempest/conf_utils.py
b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index
b3d0d01
..
95777ea
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)
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:
if image_id is not None:
rconfig.set('compute', 'image_ref', image_id)
if IMAGE_ID_ALT is not None: