aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-03 20:41:54 +0000
committerGerrit Code Review <review@openstack.org>2017-03-03 20:41:54 +0000
commit292a7514379856f5dcd990216f55701f4169618a (patch)
treeffd0a1d42d3aef8772ab27b523cd3f5e00c32adf
parentf0474c10b9a76d780acbd0629217e9cc69f383c0 (diff)
parent09665170f6d0f4536a48dd4d1444e07aa064bed7 (diff)
Merge "mariadb: Move generation of systemd drop-in to puppet-tripleo"
-rw-r--r--manifests/profile/base/database/mysql.pp15
1 files changed, 15 insertions, 0 deletions
diff --git a/manifests/profile/base/database/mysql.pp b/manifests/profile/base/database/mysql.pp
index dcd1b7f..a0193cf 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 {