aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJiri Stransky <jistr@redhat.com>2016-06-21 11:37:28 +0200
committerJiri Stransky <jistr@redhat.com>2016-06-21 11:37:28 +0200
commit26e639f4a4ade90a007fff348ad61135e97c2e1a (patch)
tree621d5d5a6bad129d9bea93dc2245394495733c45 /puppet
parent9c16693ef8c47981a209f5b37b88d95a3e72cbab (diff)
Parametrize and increase default of swift-proxy node_timeout
We've had problems uploading images on slow virtualized environments, where the requests to swift would time out. The issue has been seen both on undercloud and overcloud. The default timeout is 10 seconds, the issue has been reportedly reproduced on undercloud with node_timeout as high as 30 seconds, but not with 60 seconds yet. Set the default timeout to 60 seconds on overcloud too. Change-Id: I7d486cf4dc9768ddbf71ab71e92db8d2ef29978e Closes-Bug: #1594725
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/swift-proxy.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/puppet/services/swift-proxy.yaml b/puppet/services/swift-proxy.yaml
index a86aeaf5..930b9e3d 100644
--- a/puppet/services/swift-proxy.yaml
+++ b/puppet/services/swift-proxy.yaml
@@ -17,6 +17,10 @@ parameters:
description: The password for the swift service account, used by the swift proxy services.
type: string
hidden: true
+ SwiftProxyNodeTimeout:
+ default: 60
+ description: Timeout for requests going from swift-proxy to swift a/c/o services.
+ type: number
SwiftWorkers:
default: 0
description: Number of workers for Swift service.
@@ -36,6 +40,7 @@ outputs:
swift::proxy::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
swift::proxy::authtoken::identity_uri: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
swift::proxy::authtoken::admin_password: {get_param: SwiftPassword}
+ swift::proxy::node_timeout: {get_param: SwiftProxyNodeTimeout}
swift::proxy::workers: {get_param: SwiftWorkers}
swift::keystone::auth::public_url: {get_param: [EndpointMap, SwiftPublic, uri]}
swift::keystone::auth::internal_url: {get_param: [EndpointMap, SwiftInternal, uri]}