Merge 9d18fe8 into 0ada399

voxpupuli · May 8, 2018 · e702f66 · e702f66
2 parents 0ada399 + 9d18fe8
commit e702f66
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -253,7 +253,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
@@ -154,7 +154,11 @@
 % Configure the LDAP authentication plugin
   {rabbitmq_auth_backend_ldap, [
     {other_bind, <%= @ldap_other_bind %>},
+<% if @ldap_server.class == Array or @ldap_server =~ /^\[/  -%>
+    {servers, <%= @ldap_server %>},
+<% else -%>
     {servers, ["<%= @ldap_server %>"]},
+<% end -%>
 <% if @ldap_user_dn_pattern -%>
     {user_dn_pattern, "<%= @ldap_user_dn_pattern %>"},
 <%- end -%>