Merge pull request #302 from jonnangle/237-iptables

Allow iptables chains parameter to be an array (fix redhat-openstack#237)

spec/classes/collectd_plugin_iptables_spec.rb

@@ -18,6 +18,26 @@
     end
   end
 
+  context ':ensure => present and :chains has two chains from the same table' do
+    let :params do
+      { :chains => {
+        'filter' => ['INPUT','OUTPUT'],
+      } }
+    end
+    it 'Will create /etc/collectd.d/10-iptables.conf' do
+      should contain_file('iptables.load').with({
+        :ensure  => 'present',
+        :path    => '/etc/collectd.d/10-iptables.conf',
+        :content => /Chain filter INPUT/,
+      })
+      should contain_file('iptables.load').with({
+        :ensure  => 'present',
+        :path    => '/etc/collectd.d/10-iptables.conf',
+        :content => /Chain filter OUTPUT/,
+      })
+    end
+  end
+
   context ':ensure => absent' do
     let :params do
       {:chains => { 'nat' => 'In_SSH' }, :ensure => 'absent'}

templates/plugin/iptables.conf.erb

@@ -1,7 +1,9 @@
 <% if @chains -%>
 <Plugin iptables>
-<%   @chains.each_pair do |table,chain| -%>
+<%   @chains.each_pair do |table,chains|
+       Array(chains).each do |chain| -%>
   Chain <%= table %> <%= chain %>
+<%     end -%>
 <%   end -%>
 </Plugin>
 <% end -%>