diff options
| author |   Jose Lausuch <jose.lausuch@ericsson.com> | 2017-03-25 15:39:32 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-25 15:39:32 +0000 |
| commit | ff8ecc1fa24a81a039de8ea776c0db68dfee37fb (patch) | |
| tree | 7e0ee7c4283f364638a55e5495a4d6a40c5a8968 | |
| parent | 3a44ca9956c6abb241d03392a03701bab321dd2b (diff) | |
| parent | ab2747928de7d52f357a5185ba8f36e309914e6a (diff) | |
Merge "Change api version" into stable/danube
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/conf_utils.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 1b7182692..f4a94f654 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -341,7 +341,7 @@ def configure_tempest_multisite_params(tempest_conf_file): # cmd = ("openstack endpoint show kingbird | grep publicurl |" # "awk '{print $4}' | awk -F '/' '{print $4}'") # kingbird_api_version = os.popen(cmd).read() - kingbird_api_version = os_utils.get_endpoint(service_type='multisite') + # kingbird_api_version = os_utils.get_endpoint(service_type='multisite') if CI_INSTALLER_TYPE == 'fuel': # For MOS based setup, the service is accessible @@ -399,7 +399,7 @@ def configure_tempest_multisite_params(tempest_conf_file): config.set('kingbird', 'endpoint_type', 'publicURL') config.set('kingbird', 'TIME_TO_SYNC', '120') config.set('kingbird', 'endpoint_url', kingbird_endpoint_url) - config.set('kingbird', 'api_version', kingbird_api_version) + config.set('kingbird', 'api_version', 'v1.0') with open(tempest_conf_file, 'wb') as config_file: config.write(config_file) |