summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuha Kosonen <juha.kosonen@nokia.com>2017-02-14 12:16:21 +0200
committerJuha Kosonen <juha.kosonen@nokia.com>2017-02-14 12:16:21 +0200
commit6460a7d4c129bd3eb1096f8bc7e9dfdcca907009 (patch)
tree46c1ffe0f6e46dc9a219a2f7b2102ce9f23b04ca
parent66d02a85d91c5981ae3c2ebf5fa5b1e51c7ad143 (diff)
Fix config file name setting
JIRA: FUNCTEST-725 Change-Id: Ic1e6a54c2dbfb1dee5f8f6e6afd60382749bcd09 Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
-rw-r--r--functest/opnfv_tests/openstack/tempest/conf_utils.py6
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):