X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fmemcached.yaml;h=146cc306129630230f9b89d28c4ba7346025d06a;hb=7c84a9b390c469e716e5802eef078d2df3902c6a;hp=eba8a58bf932791de986b6a566fa27b92f5a95d1;hpb=854b5120cc04418b34e45a523d0ea67ae64a448e;p=apex-tripleo-heat-templates.git

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