Merge 5022f18 into f8d2170

voxpupuli · Oct 18, 2019 · 2b86cc9 · 2b86cc9
2 parents f8d2170 + 5022f18
commit 2b86cc9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -157,7 +157,7 @@
 # @param ldap_auth
 #   Set to true to enable LDAP auth.
 # @param ldap_server
-#   LDAP server to use for auth.
+#   LDAP server or servers to use for auth.
 # @param ldap_user_dn_pattern
 #   User DN pattern for LDAP auth.
 # @param ldap_other_bind
@@ -367,7 +367,7 @@
   Array $ssl_ciphers                                                                               = [],
   Boolean $stomp_ensure                                                                            = false,
   Boolean $ldap_auth                                                                               = false,
-  String $ldap_server                                                                              = 'ldap',
+  Variant[String,Array[String]] $ldap_server                                                       = 'ldap',
   Optional[String] $ldap_user_dn_pattern                                                           = undef,
   String $ldap_other_bind                                                                          = 'anon',
   Boolean $ldap_use_ssl                                                                            = false,

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 -%>
+    {servers, <%= @ldap_server %>},
+<% else -%>
     {servers, ["<%= @ldap_server %>"]},
+<% end -%>
 <% if @ldap_user_dn_pattern -%>
     {user_dn_pattern, "<%= @ldap_user_dn_pattern %>"},
 <%- end -%>