From 285a53a87da38a46abc6f68218380eb5dda57a63 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 (cherry picked from commit 147f5a373b4c8659826f1f626bd9b6042afc3934) --- functest/ci/config_functest.yaml | 15 --------------- functest/opnfv_tests/openstack/tempest/conf_utils.py | 3 --- 2 files changed, 18 deletions(-) diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml index eded26e75..07686f8fa 100644 --- a/functest/ci/config_functest.yaml +++ b/functest/ci/config_functest.yaml @@ -132,24 +132,9 @@ odl_sfc: tempest: verifier_name: opnfv-tempest - identity: - tenant_name: tempest - tenant_description: Tenant for Tempest test suite - user_name: tempest - user_password: Tempest123! - validation: - ssh_timeout: 130 - # network_type: vlan - # physical_network: physnet2 - # segmentation_id: 2366 - private_net_name: tempest-net - private_subnet_name: tempest-subnet - private_subnet_cidr: 192.168.150.0/24 - router_name: tempest-router rally: deployment_name: opnfv-rally - network_name: rally-net vnf: juju_epc: 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