aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ci/config_functest.yaml2
-rwxr-xr-xtestcases/OpenStack/tempest/run_tempest.py3
2 files changed, 5 insertions, 0 deletions
diff --git a/ci/config_functest.yaml b/ci/config_functest.yaml
index e4468208..fb4103d3 100644
--- a/ci/config_functest.yaml
+++ b/ci/config_functest.yaml
@@ -74,6 +74,8 @@ tempest:
tenant_description: Tenant for Tempest test suite
user_name: tempest
user_password: tempest
+ validation:
+ ssh_timeout: 130
private_net_name: tempest-net
private_subnet_name: tempest-subnet
private_subnet_cidr: 192.168.150.0/24
diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py
index 4a8a3d06..d29b3f3b 100755
--- a/testcases/OpenStack/tempest/run_tempest.py
+++ b/testcases/OpenStack/tempest/run_tempest.py
@@ -81,6 +81,8 @@ TENANT_DESCRIPTION = functest_yaml.get("tempest").get("identity").get(
USER_NAME = functest_yaml.get("tempest").get("identity").get("user_name")
USER_PASSWORD = functest_yaml.get("tempest").get("identity").get(
"user_password")
+SSH_TIMEOUT = functest_yaml.get("tempest").get("validation").get(
+ "ssh_timeout")
DEPLOYMENT_MAME = functest_yaml.get("rally").get("deployment_name")
RALLY_INSTALLATION_DIR = functest_yaml.get("general").get("directories").get(
"dir_rally_inst")
@@ -198,6 +200,7 @@ def configure_tempest(deployment_dir):
config.set('identity', 'tenant_name', TENANT_NAME)
config.set('identity', 'username', USER_NAME)
config.set('identity', 'password', USER_PASSWORD)
+ config.set('validation', 'ssh_timeout', SSH_TIMEOUT)
if os.getenv('OS_ENDPOINT_TYPE') is not None:
services_list = ['compute', 'volume', 'image', 'network',