diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-05 00:36:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-05 00:36:14 +0000 |
| commit | 29faa38ddca3a91d6944bdda8daceda4dde2b128 (patch) | |
| tree | acadb5a8bbc2b04b21f971a67c56333f4bf720aa | |
| parent | ac03bcfffef5a83df4a458cbc92117ada6cf7301 (diff) | |
| parent | 75d48838020ad9ff2bbd739212599ec8eb932649 (diff) | |
Merge "Add params to tweak memory limit on mongodb"
| -rw-r--r-- | puppet/services/database/mongodb.yaml | 5 | ||||
| -rw-r--r-- | releasenotes/notes/restrict-mongodb-memory-de7bf6754d7234d9.yaml | 3 |
2 files changed, 8 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': diff --git a/releasenotes/notes/restrict-mongodb-memory-de7bf6754d7234d9.yaml b/releasenotes/notes/restrict-mongodb-memory-de7bf6754d7234d9.yaml new file mode 100644 index 00000000..86622bc1 --- /dev/null +++ b/releasenotes/notes/restrict-mongodb-memory-de7bf6754d7234d9.yaml @@ -0,0 +1,3 @@ +--- +fixes: + - Add knobs to limit memory comsumed by mongodb with systemd |