diff options
| author |   Linda Wang <wangwulin@huawei.com> | 2018-03-05 09:02:48 +0000 |
|---|---|---|
| committer | Linda Wang <wangwulin@huawei.com> | 2018-03-05 09:54:45 +0000 |
| commit | 5de084c996d949deb1b6804a1c244d9aeb4e6ea6 (patch) | |
| tree | b5549f8f1777bb1d6d6961e52ab3415ec7efb0dc /functest/opnfv_tests/openstack/tempest/conf_utils.py | |
| parent | 286a2f76763fb80bf117a70b355785c5a64acfd3 (diff) | |
Config volume_device_name as vdc for fuel
JIRA: FUNCTEST-947
Change-Id: I69a83dc69eaa4379c630e201e837f29311c716b9
Signed-off-by: Linda Wang <wangwulin@huawei.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest/conf_utils.py')
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/conf_utils.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 786a7c5b6..e50c61af9 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -229,6 +229,7 @@ def update_tempest_conf_file(conf_file, rconfig): def configure_tempest_update_params(tempest_conf_file, network_name=None, image_id=None, flavor_id=None, compute_cnt=1): + # pylint: disable=too-many-branches """ Add/update needed parameters into tempest.conf file """ @@ -236,6 +237,8 @@ def configure_tempest_update_params(tempest_conf_file, network_name=None, rconfig = ConfigParser.RawConfigParser() rconfig.read(tempest_conf_file) rconfig.set('compute', 'fixed_network_name', network_name) + if CI_INSTALLER_TYPE == 'fuel': + setattr(config.CONF, 'tempest_volume_device_name', 'vdc') rconfig.set('compute', 'volume_device_name', getattr(config.CONF, 'tempest_volume_device_name')) |