diff --git a/Puppetfile b/Puppetfile
index 6dc35dbc3..8224db2e5 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -243,7 +243,7 @@ mod 'tomcat',
   :git => 'https://github.com/puppetlabs/puppetlabs-tomcat.git'
 
 mod 'tripleo',
-  :commit => 'b34e7cb9ed8984a98ba3e3deda184f7c6461149c',
+  :commit => 'a3f18d9a1acff607932071b492433f2073c8a0b2',
   :git => 'https://github.com/openstack/puppet-tripleo.git'
 
 mod 'trove',
diff --git a/tripleo/manifests/loadbalancer.pp b/tripleo/manifests/loadbalancer.pp
index 75ba7f58b..459a5c634 100644
--- a/tripleo/manifests/loadbalancer.pp
+++ b/tripleo/manifests/loadbalancer.pp
@@ -268,6 +268,11 @@
 #  (optional) Enable or not Redis binding
 #  Defaults to false
 #
+# [*redis_password*]
+#  (optional) Password for Redis authentication, eventually needed by the
+#  specific monitoring we do from HAProxy for Redis
+#  Defaults to undef
+#
 # [*midonet_api*]
 #  (optional) Enable or not MidoNet API binding
 #  Defaults to false
@@ -365,6 +370,7 @@
   $mysql_clustercheck        = false,
   $rabbitmq                  = false,
   $redis                     = false,
+  $redis_password            = undef,
   $midonet_api               = false,
   $service_ports             = {}
 ) {
@@ -1173,12 +1179,17 @@
   }
 
   if $redis {
+    if $redis_password {
+      $redis_tcp_check_options = ["send AUTH\\ ${redis_password}\\r\\n"]
+    } else {
+      $redis_tcp_check_options = []
+    }
     haproxy::listen { 'redis':
       bind             => $redis_bind_opts,
       options          => {
         'balance'   => 'first',
         'option'    => ['tcp-check',],
-        'tcp-check' => ['send info\ replication\r\n','expect string role:master'],
+        'tcp-check' => union($redis_tcp_check_options, ['send PING\r\n','expect string +PONG','send info\ replication\r\n','expect string role:master','send QUIT\r\n','expect string +OK']),
       },
       collect_exported => false,
     }