From c9acf8a687ea64686c1ecceeff45add014752121 Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Thu, 9 Mar 2017 12:04:10 -0500
Subject: Fixes issues with raising mysql file limit

Changes Include:
 - Adds spec testing
 - Only raise limits if nonha.  puppet-systemd will restart the mariadb
   service which breaks ha deployments.  Hence we only want to do this
   in noha.
 - Minor fix to hiera value refrenced not as parameter to mysql.pp

Partial-Bug: #1648181
Related-Bug: #1524809

Co-Authored By: Feng Pan <fpan@redhat.com>

Change-Id: Id063bf4b4ac229181b01f40965811cb8ac4230d5
Signed-off-by: Tim Rozet <trozet@redhat.com>
Signed-off-by: Feng Pan <fpan@redhat.com>
---
 manifests/profile/base/database/mysql.pp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'manifests')

diff --git a/manifests/profile/base/database/mysql.pp b/manifests/profile/base/database/mysql.pp
index a0193cf..80b07d4 100644
--- a/manifests/profile/base/database/mysql.pp
+++ b/manifests/profile/base/database/mysql.pp
@@ -62,6 +62,10 @@
 #   Should be an hash.
 #   Defaults to {}
 #
+# [*mysql_max_connections*]
+#   (Optional) Maximum number of connections to MySQL.
+#   Defaults to hiera('mysql_max_connections', undef)
+#
 # [*remove_default_accounts*]
 #   (Optional) Whether or not remove default MySQL accounts.
 #   Defaults to true
@@ -81,6 +85,7 @@ class tripleo::profile::base::database::mysql (
   $generate_service_certificates = hiera('generate_service_certificates', false),
   $manage_resources              = true,
   $mysql_server_options          = {},
+  $mysql_max_connections         = hiera('mysql_max_connections', undef),
   $remove_default_accounts       = true,
   $step                          = hiera('step'),
 ) {
@@ -126,7 +131,7 @@ class tripleo::profile::base::database::mysql (
     $mysql_server_default = {
       'mysqld' => {
         'bind-address'          => $bind_address,
-        'max_connections'       => hiera('mysql_max_connections'),
+        'max_connections'       => $mysql_max_connections,
         'open_files_limit'      => '-1',
         'innodb_file_per_table' => 'ON',
         'ssl'                   => $enable_internal_tls,
@@ -146,11 +151,11 @@ class tripleo::profile::base::database::mysql (
       remove_default_accounts => $remove_default_accounts,
     }
 
-    if $generate_dropin_file_limit {
+    if $generate_dropin_file_limit and $manage_resources {
       # Raise the mysql file limit
       ::systemd::service_limits { 'mariadb.service':
         limits => {
-          LimitNOFILE => 16384
+          'LimitNOFILE' => 16384
         }
       }
     }
-- 
cgit 1.2.3-korg