diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2017-02-14 11:14:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-02-14 11:14:29 +0000 |
| commit | 145b5f3f9e1cf70c0825459ff641e05ea851fcfe (patch) | |
| tree | f46b4e7ebbcdb243749dc78278fdd52262827bc8 /functest/opnfv_tests/openstack | |
| parent | 33ee390f8324175ae59775bc2589711a60f03939 (diff) | |
| parent | 6460a7d4c129bd3eb1096f8bc7e9dfdcca907009 (diff) | |
Merge "Fix config file name setting"
Diffstat (limited to 'functest/opnfv_tests/openstack')
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/conf_utils.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 03735baab..028b085c9 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -111,8 +111,8 @@ def configure_tempest(deployment_dir, IMAGE_ID=None, FLAVOR_ID=None): Calls rally verify and updates the generated tempest.conf with given parameters """ - conf_verifier_result = configure_verifier(deployment_dir) - configure_tempest_update_params(conf_verifier_result, + conf_file = configure_verifier(deployment_dir) + configure_tempest_update_params(conf_file, IMAGE_ID, FLAVOR_ID) @@ -192,6 +192,8 @@ def configure_verifier(deployment_dir): % tempest_conf_file) raise Exception("Tempest configuration file %s NOT found." % tempest_conf_file) + else: + return tempest_conf_file def configure_tempest_multisite(deployment_dir): |