Merge "Replace domain name from Default to default"

[functest.git] / functest / opnfv_tests / openstack / tempest / conf_utils.py

diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index 3ff8a22..1b71826 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -35,6 +35,8 @@ TEMPEST_DEFCORE = os.path.join(REPO_PATH, TEMPEST_TEST_LIST_DIR,
                                'defcore_req.txt')
 TEMPEST_RAW_LIST = os.path.join(TEMPEST_RESULTS_DIR, 'test_raw_list.txt')
 TEMPEST_LIST = os.path.join(TEMPEST_RESULTS_DIR, 'test_list.txt')
+REFSTACK_RESULTS_DIR = os.path.join(CONST.dir_results,
+                                    'refstack')
 
 CI_INSTALLER_TYPE = CONST.INSTALLER_TYPE
 CI_INSTALLER_IP = CONST.INSTALLER_IP
@@ -262,6 +264,8 @@ def configure_tempest_update_params(tempest_conf_file,
         'compute',
         'fixed_network_name',
         CONST.tempest_private_net_name)
+    config.set('compute', 'volume_device_name',
+               CONST.tempest_volume_device_name)
     if CONST.tempest_use_custom_images:
         if IMAGE_ID is not None:
             config.set('compute', 'image_ref', IMAGE_ID)
@@ -388,8 +392,12 @@ def configure_tempest_multisite_params(tempest_conf_file):
         config.add_section("kingbird")
     except Exception:
         logger.info('kingbird section exist')
+
+    # set the domain id
+    config.set('auth', 'admin_domain_name', 'default')
+
     config.set('kingbird', 'endpoint_type', 'publicURL')
-    config.set('kingbird', 'TIME_TO_SYNC', '20')
+    config.set('kingbird', 'TIME_TO_SYNC', '120')
     config.set('kingbird', 'endpoint_url', kingbird_endpoint_url)
     config.set('kingbird', 'api_version', kingbird_api_version)
     with open(tempest_conf_file, 'wb') as config_file: