diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2017-12-07 15:26:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-07 15:26:32 +0000 |
| commit | 04886b12a4f5c3f18c71f0ca78fdbcf8a545f5f6 (patch) | |
| tree | 90e5139ed774f620b336296f8829fbc7a6a7247c /functest/opnfv_tests/openstack/tempest/conf_utils.py | |
| parent | 2800b22d762e938727ec4b466178eca4de05006d (diff) | |
| parent | fa0a614c8ea3e757440c82380707e0221079e32a (diff) | |
Merge "Fix the yamllint errors in functest/ci"
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest/conf_utils.py')
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/conf_utils.py | 10 |
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 b4026def3..fff99a320 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) |