3 files changed, 29 insertions, 2 deletions
diff --git a/manifests/profile/pacemaker/database/mysql.pp b/manifests/profile/pacemaker/database/mysql.pp
index 7464854..a353e5f 100644
--- a/manifests/profile/pacemaker/database/mysql.pp
+++ b/manifests/profile/pacemaker/database/mysql.pp
@@ -89,9 +89,19 @@ class tripleo::profile::pacemaker::database::mysql (
     }
   }
 
+  # remove_default_accounts parameter will execute some mysql commands
+  # to remove the default accounts created by MySQL package.
+  # We need MySQL running to run the commands successfully, so better to
+  # wait step 2 before trying to run the commands.
+  if $step >= 2 and $pacemaker_master {
+    $remove_default_accounts = true
+  } else {
+    $remove_default_accounts = false
+  }
+
   class { '::tripleo::profile::base::database::mysql':
     manage_resources        => false,
-    remove_default_accounts => $pacemaker_master,
+    remove_default_accounts => $remove_default_accounts,
     mysql_server_options    => $mysqld_options,
   }
 
diff --git a/manifests/profile/pacemaker/database/redis.pp b/manifests/profile/pacemaker/database/redis.pp
index 261df30..37c36aa 100644
--- a/manifests/profile/pacemaker/database/redis.pp
+++ b/manifests/profile/pacemaker/database/redis.pp
@@ -31,10 +31,16 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
+# [*redis_file_limit*]
+#   (Optional) The file limit to put in /etc/security/limits.d/redis.conf
+#   for when redis is managed by pacemaker. Defaults to hiera('redis_file_limit')
+#   or 10240 (default in redis systemd limits)
+#
 class tripleo::profile::pacemaker::database::redis (
   $bootstrap_node       = hiera('bootstrap_nodeid'),
   $enable_load_balancer = hiera('enable_load_balancer', true),
   $step                 = hiera('step'),
+  $redis_file_limit     = hiera('redis_file_limit', 10240),
 ) {
   if $::hostname == downcase($bootstrap_node) {
     $pacemaker_master = true
@@ -44,6 +50,17 @@ class tripleo::profile::pacemaker::database::redis (
 
   if $step >= 1 {
     include ::redis
+    # Until puppet-redis grows support for /etc/security/limits.conf/redis.conf
+    # https://github.com/arioch/puppet-redis/issues/130
+    # we best explicitely set the file limit only in the pacemaker profile
+    # (the base profile does not need it as it is using systemd which has
+    # the limits set there)
+    file { '/etc/security/limits.d/redis.conf':
+      content => inline_template("redis soft nofile <%= @redis_file_limit %>\nredis hard nofile <%= @redis_file_limit %>\n"),
+      owner   => '0',
+      group   => '0',
+      mode    => '0644',
+    }
 
     if $pacemaker_master and hiera('stack_action') == 'UPDATE' {
       tripleo::pacemaker::resource_restart_flag { 'redis-master':
diff --git a/manifests/profile/pacemaker/haproxy.pp b/manifests/profile/pacemaker/haproxy.pp
index 21d8ab1..605bb15 100644
--- a/manifests/profile/pacemaker/haproxy.pp
+++ b/manifests/profile/pacemaker/haproxy.pp
@@ -44,7 +44,7 @@ class tripleo::profile::pacemaker::haproxy (
     $pacemaker_master = false
   }
 
-  if $step >= 1 and $pacemaker_master and hiera('stack_action') == 'UPDATE' {
+  if $step >= 1 and $pacemaker_master and hiera('stack_action') == 'UPDATE' and $enable_load_balancer {
     tripleo::pacemaker::resource_restart_flag { 'haproxy-clone':
       subscribe => Concat['/etc/haproxy/haproxy.cfg'],
     }