Merge pull request #489 from cirrax/fix_add-default-server

allow type 'default-server' for balancermember
puppetlabs · Jul 6, 2021 · ea6d51e · ea6d51e
2 parents 75958e3 + baf4711
commit ea6d51e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/manifests/balancermember.pp b/manifests/balancermember.pp
@@ -136,7 +136,7 @@
 #
 define haproxy::balancermember (
   $listening_service,
-  $type         = 'server',
+  Enum['server', 'default-server', 'server-template'] $type         = 'server',
   $ports        = undef,
   $port         = undef,
   $server_names = $::hostname,

diff --git a/templates/haproxy_balancermember.erb b/templates/haproxy_balancermember.erb
@@ -10,4 +10,6 @@
 <% end -%>
 <% elsif @type == 'server-template' -%>
   server-template <%= @prefix %> <%= @amount %> <%= @fqdn %><%= @port ? ":#{@port}" : "" %><%= if @define_cookies then " cookie " + @fqdn end %> <%= Array(@options).sort.join(" ") %><% if @verifyhost == true %> verifyhost <%= @fqdn %><% end %><% if @weight %> weight <%= @weight %><% end %>
-<% end -%>
+<% elsif @type == 'default-server' -%>
+  default-server <%= Array(@options).join(" ") %>
+<% end -%>