diff options
author | 2016-09-21 23:10:12 +0000 | |
---|---|---|
committer | 2016-09-21 23:10:12 +0000 | |
commit | a3dd85c2bfdb97a72b150b51dd6cac85c597a714 (patch) | |
tree | 4219bd1520021e692d6b8d499ac3b461cc89d08b | |
parent | 2303d70d8083995a2e9960fe422d5f43c3cae617 (diff) | |
parent | b524c0999f447d7931fcacb37e2989d3bf66ad26 (diff) |
Merge "Provide for RAM-constrained environments"
-rw-r--r-- | environments/low-memory-usage.yaml | 14 | ||||
-rw-r--r-- | puppet/services/apache.yaml | 10 |
2 files changed, 24 insertions, 0 deletions
diff --git a/environments/low-memory-usage.yaml b/environments/low-memory-usage.yaml new file mode 100644 index 00000000..2e496f89 --- /dev/null +++ b/environments/low-memory-usage.yaml @@ -0,0 +1,14 @@ +# Lower the memory usage of overcloud. +parameter_defaults: + CeilometerWorkers: 1 + CinderWorkers: 1 + GlanceWorkers: 1 + HeatWorkers: 1 + KeystoneWorkers: 1 + NeutronWorkers: 1 + NovaWorkers: 1 + SaharaWorkers: 1 + SwiftWorkers: 1 + + ApacheMaxRequestWorkers: 32 + ApacheServerLimit: 32 diff --git a/puppet/services/apache.yaml b/puppet/services/apache.yaml index 7595e4c3..c9792019 100644 --- a/puppet/services/apache.yaml +++ b/puppet/services/apache.yaml @@ -5,6 +5,14 @@ description: > automatically via other services which run via Apache. parameters: + ApacheMaxRequestWorkers: + default: 256 + description: Maximum number of simultaneously processed requests. + type: number + ApacheServerLimit: + default: 256 + description: Maximum number of Apache processes. + type: number ServiceNetMap: default: {} description: Mapping of service_name -> network name. Typically set @@ -38,5 +46,7 @@ outputs: template: "NETWORK_subnet" params: NETWORK: {get_param: [ServiceNetMap, ApacheNetwork]} + apache::mod::prefork::maxclients: { get_param: ApacheMaxRequestWorkers } + apache::mod::prefork::serverlimit: { get_param: ApacheServerLimit } apache::mod::remoteip::proxy_ips: - "%{hiera('apache_remote_proxy_ips_network')}" |