Merge "Remove setting custom http_timeout in grenade"
This commit is contained in:
commit
2a7f939663
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user