diff options
| author |   Helen Yao <yaohelan@huawei.com> | 2017-03-25 01:22:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-25 01:22:46 +0000 |
| commit | d48e87aa768d193efac2677169265dce16c5fdac (patch) | |
| tree | 400801a6345125a8aa52aa9730a1e5ee8e27a327 /functest/opnfv_tests | |
| parent | 70cfbfdf6a040b9cd7d383ed863d12f90a77d389 (diff) | |
| parent | 3fb0175dab6d60af2fe40274fab19abf3ea6162f (diff) | |
Merge "Change api version"
Diffstat (limited to 'functest/opnfv_tests')
| -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 1b718269..f4a94f65 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) |