Merge pull request #16 from hunner/update_balancer_ports

Update the haproxy::balancermember for multiple ports

3 files changed, 75 insertions, 58 deletions

diff --git a/manifests/balancermember.pp b/manifests/balancermember.pp
index d43d98a..a54d92e 100644
--- a/manifests/balancermember.pp
+++ b/manifests/balancermember.pp
@@ -25,30 +25,30 @@
 #     haproxy::listen resource). This must match up with a declared
 #     haproxy::listen resource.
 #
-# [*balancer_port*]
-#     A unique port for which the balancer member will accept connections
-#     from the load balancer. Note that cookie values aren't yet supported,
-#     but shouldn't be difficult to add to the configuration.
-#     If you use an array in server_name and balancer_ip, the same port is
-#     used for all balancermembers.
+# [*ports*]
+#     An array or commas-separated list of ports for which the balancer member
+#     will accept connections from the load balancer. Note that cookie values
+#     aren't yet supported, but shouldn't be difficult to add to the
+#     configuration. If you use an array in server_names and ipaddresses, the
+#     same port is used for all balancermembers.
 #
 # [*order*]
 #     The order, or numerical weight, of the fragment created by this defined
 #      resource type. This is necessary to ensure the fragment is associated
 #      with the correct listening service instance.
 #
-# [*server_name*]
+# [*server_names*]
 #     The name of the balancer member server as known to haproxy in the
 #      listening service's configuration block. This defaults to the
-#      hostname. Can be an array of the same length as balancer_ip,
+#      hostname. Can be an array of the same length as ipaddresses,
 #      in which case a balancermember is created for each pair of
-#      server_name and balancer_ip (in lockstep).
+#      server_names and ipaddresses (in lockstep).
 #
-# [*balancer_ip*]
+# [*ipaddresses*]
 #      The ip address used to contact the balancer member server.
-#      Can be an array, see documentation to server_name.
+#      Can be an array, see documentation to server_names.
 #
-# [*balancermember_options*]
+# [*options*]
 #      An array of options to be specified after the server declaration
 #       in the listening service's configuration block.
 #
@@ -58,12 +58,12 @@
 #  Exporting the resource for a balancer member:
 #
 #  @@haproxy::balancermember { 'haproxy':
-#    listening_service      => 'puppet00',
-#    balancer_port          => '8140',
-#    order                  => '21',
-#    server_name            => $::hostname,
-#    balancer_ip            => $::ipaddress,
-#    balancermember_options => 'check',
+#    listening_service => 'puppet00',
+#    ports             => '8140',
+#    order             => '21',
+#    server_names      => $::hostname,
+#    ipaddresses       => $::ipaddress,
+#    options           => 'check',
 #  }
 #
 #
@@ -76,28 +76,25 @@
 #  pass to export the resources if you know the members in advance):
 # 
 #  haproxy::balancermember { 'haproxy':
-#    listening_service      => 'puppet00',
-#    balancer_port          => '8140',
-#    order                  => '21',
-#    server_name            => ['server01', 'server02'],
-#    balancer_ip            => ['192.168.56.200', '192.168.56.201'],
-#    balancermember_options => 'check',
+#    listening_service => 'puppet00',
+#    ports             => '8140',
+#    order             => '21',
+#    server_names      => ['server01', 'server02'],
+#    ipaddresses       => ['192.168.56.200', '192.168.56.201'],
+#    options           => 'check',
 #  }
 #  
 #  (this resource can be declared anywhere)
 #
-# === Authors
-#
-# Gary Larizza <gary@puppetlabs.com>
-#
 define haproxy::balancermember (
   $listening_service,
-  $balancer_port,
-  $order                  = '20',
-  $server_name            = $::hostname,
-  $balancer_ip            = $::ipaddress,
-  $balancermember_options = ''
+  $ports,
+  $order        = '20',
+  $server_names = $::hostname,
+  $ipaddresses  = $::ipaddress,
+  $options      = ''
 ) {
+  # Template uses $ipaddresses, $server_name, $ports, $option
   concat::fragment { "${listening_service}_balancermember_${name}":
     order   => $order,
     target  => '/etc/haproxy/haproxy.cfg',
diff --git a/spec/defines/balancermember_spec.rb b/spec/defines/balancermember_spec.rb
index 73aa223..1a37673 100644
--- a/spec/defines/balancermember_spec.rb
+++ b/spec/defines/balancermember_spec.rb
@@ -3,58 +3,80 @@ require 'spec_helper'
 describe 'haproxy::balancermember' do
   let(:title) { 'tyler' }
   let(:facts) do
-    { :ipaddress => '1.1.1.1',
+    {
+      :ipaddress => '1.1.1.1',
       :hostname  => 'dero'
     }
   end
 
   context 'with a single balancermember option' do
     let(:params) do
-      { :name                   => 'tyler',
-        :listening_service      => 'croy',
-        :balancer_port          => '18140',
-        :balancermember_options => 'check'
+      {
+        :name              => 'tyler',
+        :listening_service => 'croy',
+        :ports             => '18140',
+        :options           => 'check'
       }
     end
 
     it { should contain_concat__fragment('croy_balancermember_tyler').with(
       'order'   => '20',
       'target'  => '/etc/haproxy/haproxy.cfg',
-      'content' => "  server  dero 1.1.1.1:18140  check\n\n"
-      ) }
+      'content' => "  server dero 1.1.1.1:18140 check\n\n"
+    ) }
   end
 
   context 'with multiple balancermember options' do
     let(:params) do
-      { :name                   => 'tyler',
-        :listening_service      => 'croy',
-        :balancer_port          => '18140',
-        :balancermember_options => ['check', 'close']
+      {
+        :name              => 'tyler',
+        :listening_service => 'croy',
+        :ports             => '18140',
+        :options           => ['check', 'close']
       }
     end
 
     it { should contain_concat__fragment('croy_balancermember_tyler').with(
       'order'   => '20',
       'target'  => '/etc/haproxy/haproxy.cfg',
-      'content' => "  server  dero 1.1.1.1:18140  check close\n\n"
-      ) }
+      'content' => "  server dero 1.1.1.1:18140 check close\n\n"
+    ) }
   end
 
   context 'with multiple servers' do
     let(:params) do
-      { :name                   => 'tyler',
-        :listening_service      => 'croy',
-        :balancer_port          => '18140',
-        :server_name            => ['server01', 'server02'],
-        :balancer_ip            => ['192.168.56.200', '192.168.56.201'],
-        :balancermember_options => ['check']
+      {
+        :name              => 'tyler',
+        :listening_service => 'croy',
+        :ports             => '18140',
+        :server_names      => ['server01', 'server02'],
+        :ipaddresses       => ['192.168.56.200', '192.168.56.201'],
+        :options           => ['check']
       }
     end
 
     it { should contain_concat__fragment('croy_balancermember_tyler').with(
       'order'   => '20',
       'target'  => '/etc/haproxy/haproxy.cfg',
-      'content' => "  server  server01 192.168.56.200:18140  check\n  server  server02 192.168.56.201:18140  check\n\n"
-      ) }
+      'content' => "  server server01 192.168.56.200:18140 check\n  server server02 192.168.56.201:18140 check\n\n"
+    ) }
+  end
+  context 'with multiple servers and multiple ports' do
+    let(:params) do
+      {
+        :name              => 'tyler',
+        :listening_service => 'croy',
+        :ports             => ['18140','18150'],
+        :server_names      => ['server01', 'server02'],
+        :ipaddresses       => ['192.168.56.200', '192.168.56.201'],
+        :options           => ['check']
+      }
+    end
+
+    it { should contain_concat__fragment('croy_balancermember_tyler').with(
+      'order'   => '20',
+      'target'  => '/etc/haproxy/haproxy.cfg',
+      'content' => "  server server01 192.168.56.200:18140,192.168.56.200:18150 check\n  server server02 192.168.56.201:18140,192.168.56.201:18150 check\n\n"
+    ) }
   end
 end
diff --git a/templates/haproxy_balancermember.erb b/templates/haproxy_balancermember.erb
index fca4f0b..1d03f56 100644
--- a/templates/haproxy_balancermember.erb
+++ b/templates/haproxy_balancermember.erb
@@ -1,5 +1,3 @@
-<% for @ip,@host in Array(@balancer_ip).zip(Array(@server_name)) %>  server  <%= @host %> <%= @ip %>:<%= balancer_port %> <%
-    items = balancermember_options
-    items = [items] unless balancermember_options.instance_of? Array
-    items.each do |item| %> <%= item %><% end %>
+<% Array(ipaddresses).zip(Array(server_names)).each do |ipaddress,host| -%>
+  server <%= host %> <%= ipaddress %>:<%= Array(ports).collect {|x|x.split(',')}.flatten.join(",#{ipaddress}:") %> <%= Array(options).join(" ") %>
 <% end %>