From d38eac945da767b39f798dba3f064271dddcba6d Mon Sep 17 00:00:00 2001
From: skrussell <russell@samknows.com>
Date: Wed, 7 Feb 2018 15:30:29 +0000
Subject: [PATCH 1/3] Make the ldap_servers variable able to accept and process
 an array of strings, as well as just a single string

---
 manifests/init.pp             | 2 +-
 templates/rabbitmq.config.erb | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 4d91dacd0..70381593d 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -251,7 +251,7 @@
   Array $ssl_ciphers                                               = $rabbitmq::params::ssl_ciphers,
   Boolean $stomp_ensure                                            = $rabbitmq::params::stomp_ensure,
   Boolean $ldap_auth                                               = $rabbitmq::params::ldap_auth,
-  String $ldap_server                                              = $rabbitmq::params::ldap_server,
+  Variant[String,Array[String]] $ldap_server                       = $rabbitmq::params::ldap_server,
   Optional[String] $ldap_user_dn_pattern                           = $rabbitmq::params::ldap_user_dn_pattern,
   String $ldap_other_bind                                          = $rabbitmq::params::ldap_other_bind,
   Boolean $ldap_use_ssl                                            = $rabbitmq::params::ldap_use_ssl,
diff --git a/templates/rabbitmq.config.erb b/templates/rabbitmq.config.erb
index 791c919b8..f1d1e0316 100644
--- a/templates/rabbitmq.config.erb
+++ b/templates/rabbitmq.config.erb
@@ -153,7 +153,11 @@
 % Configure the LDAP authentication plugin
   {rabbitmq_auth_backend_ldap, [
     {other_bind, <%= @ldap_other_bind %>},
+<% if @ldap_server.class == Array -%>
+    {servers, <%= @ldap_server %>}
+<% else -%>
     {servers, ["<%= @ldap_server %>"]},
+<% end -%>
 <% if @ldap_user_dn_pattern -%>
     {user_dn_pattern, "<%= @ldap_user_dn_pattern %>"},
 <%- end -%>

From 1f9fe2a7a367e24d11d532eab831e9e95b7ae331 Mon Sep 17 00:00:00 2001
From: skrussell <russell@samknows.com>
Date: Wed, 7 Feb 2018 16:34:40 +0000
Subject: [PATCH 2/3] Accept an already flattened array by checking for leading
 square brackets (useful when passing hiera scoped variable source)

---
 templates/rabbitmq.config.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/rabbitmq.config.erb b/templates/rabbitmq.config.erb
index f1d1e0316..957f57850 100644
--- a/templates/rabbitmq.config.erb
+++ b/templates/rabbitmq.config.erb
@@ -153,7 +153,7 @@
 % Configure the LDAP authentication plugin
   {rabbitmq_auth_backend_ldap, [
     {other_bind, <%= @ldap_other_bind %>},
-<% if @ldap_server.class == Array -%>
+<% if @ldap_server.class == Array or @ldap_server =~ /^\[/  -%>
     {servers, <%= @ldap_server %>}
 <% else -%>
     {servers, ["<%= @ldap_server %>"]},

From 5f12a28db7fe3a33ffd95dfc6949d2f86df137b6 Mon Sep 17 00:00:00 2001
From: skrussell <russell@samknows.com>
Date: Fri, 23 Feb 2018 16:46:44 +0000
Subject: [PATCH 3/3] Add missing comma

---
 templates/rabbitmq.config.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/rabbitmq.config.erb b/templates/rabbitmq.config.erb
index 957f57850..25c0fb25d 100644
--- a/templates/rabbitmq.config.erb
+++ b/templates/rabbitmq.config.erb
@@ -154,7 +154,7 @@
   {rabbitmq_auth_backend_ldap, [
     {other_bind, <%= @ldap_other_bind %>},
 <% if @ldap_server.class == Array or @ldap_server =~ /^\[/  -%>
-    {servers, <%= @ldap_server %>}
+    {servers, <%= @ldap_server %>},
 <% else -%>
     {servers, ["<%= @ldap_server %>"]},
 <% end -%>