diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-07-08 09:47:49 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-07-08 09:47:49 +0000 |
commit | f91f08a5288820a77f45099092914a65a038caa5 (patch) | |
tree | ab535a03a646888f4751a6df1b31e832c14f5bc1 /puppet | |
parent | 3b9544b265ff239225ef7a23986182019a14d34b (diff) | |
parent | 26e639f4a4ade90a007fff348ad61135e97c2e1a (diff) |
Merge "Parametrize and increase default of swift-proxy node_timeout"
Diffstat (limited to 'puppet')
-rw-r--r-- | puppet/services/swift-proxy.yaml | 5 |
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]} |