From 147f5a373b4c8659826f1f626bd9b6042afc3934 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sun, 3 Mar 2019 13:31:15 +0100 Subject: Stop overriding ssh default timeout MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It should be modified by tempest custom yaml file instead. It's safe as the default timeout is bigger than the previous one. It also cleans the obsolete tempest/rally data in config_functest.yaml. [1] https://docs.openstack.org/tempest/latest/sampleconf.html Change-Id: Ibad02d8aaf90f154c82f3b60a6d3f04fc37bd7de Signed-off-by: Cédric Ollivier --- functest/opnfv_tests/openstack/tempest/conf_utils.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'functest/opnfv_tests/openstack') diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py index 5639f431c..7e42ad3d4 100644 --- a/functest/opnfv_tests/openstack/tempest/conf_utils.py +++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py @@ -165,9 +165,6 @@ def configure_tempest_update_params( rconfig.set('network', 'default_network', cidr) rconfig.set('network', 'project_network_cidr', cidr) rconfig.set('network', 'project_networks_reachable', False) - rconfig.set( - 'validation', 'ssh_timeout', - getattr(config.CONF, 'tempest_validation_ssh_timeout')) rconfig.set( 'identity', 'v3_endpoint_type', os.environ.get('OS_INTERFACE', 'public')) -- cgit 1.2.3-korg