aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/openstack/tempest/conf_utils.py
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2017-12-04 06:36:06 +0000
committerLinda Wang <wangwulin@huawei.com>2017-12-06 01:47:21 +0000
commitfa0a614c8ea3e757440c82380707e0221079e32a (patch)
treeb45c7913cc2391fa811620b51152792e8ba8302d /functest/opnfv_tests/openstack/tempest/conf_utils.py
parent0273da05f68727835b5fc778f54eb70ccae209d8 (diff)
Fix the yamllint errors in functest/ci
And also, remove the params "tempest_use_custom_images" and "unique_names" of vping, rally and tempest. Change-Id: Ic4243ef2f5e965910e5befa87db8d585cad34fa2 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.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index b4026def..fff99a32 100644
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -257,11 +257,11 @@ def configure_tempest_update_params(tempest_conf_file, image_id=None,
CONST.__getattribute__('tempest_private_net_name'))
config.set('compute', 'volume_device_name',
CONST.__getattribute__('tempest_volume_device_name'))
- if CONST.__getattribute__('tempest_use_custom_images'):
- if image_id is not None:
- config.set('compute', 'image_ref', image_id)
- if IMAGE_ID_ALT is not None:
- config.set('compute', 'image_ref_alt', IMAGE_ID_ALT)
+
+ if image_id is not None:
+ config.set('compute', 'image_ref', image_id)
+ if IMAGE_ID_ALT is not None:
+ config.set('compute', 'image_ref_alt', IMAGE_ID_ALT)
if CONST.__getattribute__('tempest_use_custom_flavors'):
if flavor_id is not None:
config.set('compute', 'flavor_ref', flavor_id)