summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-11 20:21:43 +0000
committerGerrit Code Review <review@openstack.org>2016-11-11 20:21:43 +0000
commit7c017a85c5d84ba7b15a7ed7a85ad8ceb9dc2ebb (patch)
tree9765975f06f4087f04df37766fab6a1efa27150a
parentd3acb7983f3379b5bf44bb1b5b352c6c853562da (diff)
parentc99c48b84e20925b4f4b728e9b103d6c8bcb3d11 (diff)
Merge "Increasing neutron timeout for low memory usage"
-rw-r--r--environments/low-memory-usage.yaml3
1 files changed, 3 insertions, 0 deletions
diff --git a/environments/low-memory-usage.yaml b/environments/low-memory-usage.yaml
index ad428686..47b2003d 100644
--- a/environments/low-memory-usage.yaml
+++ b/environments/low-memory-usage.yaml
@@ -13,3 +13,6 @@ parameter_defaults:
ApacheMaxRequestWorkers: 32
ApacheServerLimit: 32
+
+ ControllerExtraConfig:
+ 'nova::network::neutron::neutron_url_timeout': '60'