diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-14 22:04:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-14 22:04:00 +0000 |
| commit | 681fdb50e06158d38f53cb281b1a3042fe3de929 (patch) | |
| tree | 28e4c267f3d87bc0768ce2bc57df1ab7639f3fde | |
| parent | fe4311207f3ba382a4d647c933c9d4edd833dfd1 (diff) | |
| parent | 97e0768dfae29caeb78acc6fe3427d01762315cf (diff) | |
Merge "Reduce memcached memory configuration"
| -rw-r--r-- | puppet/services/memcached.yaml | 7 | ||||
| -rw-r--r-- | releasenotes/notes/memcached-max-memory-ef6834d17953fca6.yaml | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/puppet/services/memcached.yaml b/puppet/services/memcached.yaml index eba8a58b..146cc306 100644 --- a/puppet/services/memcached.yaml +++ b/puppet/services/memcached.yaml @@ -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 diff --git a/releasenotes/notes/memcached-max-memory-ef6834d17953fca6.yaml b/releasenotes/notes/memcached-max-memory-ef6834d17953fca6.yaml new file mode 100644 index 00000000..c14cefa0 --- /dev/null +++ b/releasenotes/notes/memcached-max-memory-ef6834d17953fca6.yaml @@ -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%. |