openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "mariadb: Move generation of systemd drop-in to puppet-tripleo"

This commit is contained in:
Jenkins 2017-03-03 20:41:54 +00:00 committed by Gerrit Code Review
parent f0474c10b9 09665170f6
commit 292a751437
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/profile/base/database/mysql.pp
View File

@ -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 {