Merge "Reduce memcached memory configuration"

This commit is contained in:
Jenkins 2017-02-14 22:04:00 +00:00 committed by Gerrit Code Review
commit 681fdb50e0
2 changed files with 14 additions and 0 deletions

View File

@ -18,6 +18,12 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
MemcachedMaxMemory:
default: '50%'
description: The maximum amount of memory for memcached to be configured
to use when installed. This can be either a percentage ('50%')
or a fixed value ('2048').
type: string
MonitoringSubscriptionMemcached:
default: 'overcloud-memcached'
type: string
@ -35,6 +41,7 @@ outputs:
# internal_api_uri -> [IP]
# internal_api_subnet - > IP/CIDR
memcached::listen_ip: {get_param: [ServiceNetMap, MemcachedNetwork]}
memcached::max_memory: {get_param: MemcachedMaxMemory}
tripleo.memcached.firewall_rules:
'121 memcached':
dport: 11211

View File

@ -0,0 +1,7 @@
---
features:
- |
Memcached max memory configuration is now exposed va MemcachedMaxMemory.
upgrade:
- |
Reduce the default memory configuration for memcached from 95% to 50%.