summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-05 00:36:14 +0000
committerGerrit Code Review <review@openstack.org>2017-04-05 00:36:14 +0000
commit29faa38ddca3a91d6944bdda8daceda4dde2b128 (patch)
treeacadb5a8bbc2b04b21f971a67c56333f4bf720aa /puppet/services
parentac03bcfffef5a83df4a458cbc92117ada6cf7301 (diff)
parent75d48838020ad9ff2bbd739212599ec8eb932649 (diff)
Merge "Add params to tweak memory limit on mongodb"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/database/mongodb.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/puppet/services/database/mongodb.yaml b/puppet/services/database/mongodb.yaml
index 63ec4446..50597216 100644
--- a/puppet/services/database/mongodb.yaml
+++ b/puppet/services/database/mongodb.yaml
@@ -19,6 +19,10 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
+ MongodbMemoryLimit:
+ default: '20G'
+ description: Limit the amount of memory mongodb uses with systemd.
+ type: string
MongoDbLoggingSource:
type: json
description: Fluentd logging configuration for mongodb.
@@ -49,6 +53,7 @@ outputs:
map_merge:
- get_attr: [MongoDbBase, role_data, config_settings]
- tripleo::profile::base::database::mongodb::mongodb_replset: {get_attr: [MongoDbBase, aux_parameters, rplset_name]}
+ tripleo::profile::base::database::mongodb::memory_limit: {get_param: MongodbMemoryLimit}
mongodb::server::service_manage: True
tripleo.mongodb.firewall_rules:
'101 mongodb_config':