From c4d9159463f47bd74db0dc62d76f2a30bd7fbac1 Mon Sep 17 00:00:00 2001 From: Vladyslav Drok Date: Fri, 11 Aug 2017 19:52:00 +0300 Subject: [PATCH] Remove setting custom http_timeout in grenade The fix to the bug this was trying to work around has merged to neutron. Change-Id: Ib89a9a61f84923db6463e97d5fd8f9580173b3df --- devstack/upgrade/upgrade.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/devstack/upgrade/upgrade.sh b/devstack/upgrade/upgrade.sh index ba1e3f6261..156f3e5703 100755 --- a/devstack/upgrade/upgrade.sh +++ b/devstack/upgrade/upgrade.sh @@ -44,11 +44,6 @@ source $TARGET_DEVSTACK_DIR/lib/neutron-legacy source $TARGET_DEVSTACK_DIR/lib/apache source $TARGET_DEVSTACK_DIR/lib/keystone -# TODO(vdrok): remove this when https://bugs.launchpad.net/neutron/+bug/1707160 -# fixed -source $TARGET_DEVSTACK_DIR/lib/tempest -iniset $TEMPEST_CONFIG service-clients http_timeout 120 - source $TOP_DIR/openrc admin admin # Keep track of the DevStack directory