diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-07 03:39:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-07 03:39:31 +0000 |
| commit | 0cad4e0a8a3ee2f63047fb0a8b76cc43eb2a3a1f (patch) | |
| tree | 2cd2b22017766bdcfeca6f302c10754ad68765b2 | |
| parent | 4b3ff753717e926a64df0173f1dafab38e41de0b (diff) | |
| parent | 5d9d1c606ca9c0ddc396819f2426a00f625a3273 (diff) | |
Merge "mariadb: Move generation of systemd drop-in to puppet-tripleo" into stable/ocata
| -rw-r--r-- | manifests/profile/base/database/mysql.pp | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/manifests/profile/base/database/mysql.pp b/manifests/profile/base/database/mysql.pp index d3c3f21..862c4bd 100644 --- a/manifests/profile/base/database/mysql.pp +++ b/manifests/profile/base/database/mysql.pp @@ -42,6 +42,11 @@ # (Optional) Whether TLS in the internal network is enabled or not. # Defaults to hiera('enable_internal_tls', false) # +# [*generate_dropin_file_limit*] +# (Optional) Generate a systemd drop-in file to raise the file descriptor +# limit for the mysql service. +# Defaults to false +# # [*generate_service_certificates*] # (Optional) Whether or not certmonger will generate certificates for # MySQL. This could be as many as specified by the $certificates_specs @@ -72,6 +77,7 @@ class tripleo::profile::base::database::mysql ( $bootstrap_node = hiera('bootstrap_nodeid', undef), $certificate_specs = {}, $enable_internal_tls = hiera('enable_internal_tls', false), + $generate_dropin_file_limit = false, $generate_service_certificates = hiera('generate_service_certificates', false), $manage_resources = true, $mysql_server_options = {}, @@ -139,6 +145,15 @@ class tripleo::profile::base::database::mysql ( service_enabled => $manage_resources, remove_default_accounts => $remove_default_accounts, } + + if $generate_dropin_file_limit { + # Raise the mysql file limit + ::systemd::service_limits { 'mariadb.service': + limits => { + LimitNOFILE => 16384 + } + } + } } if $step >= 2 and $sync_db { |