Fix some correctness issues identified by foodcritic

[chef.git] / cookbooks / networking / recipes / default.rb

diff --git a/cookbooks/networking/recipes/default.rb b/cookbooks/networking/recipes/default.rb
index f68522bcf56228f94b70a0320ee935499b0f5d9c..9e87e2855ce147731ac3b36a3d7d490f8ab78b76 100644 (file)
--- a/cookbooks/networking/recipes/default.rb
+++ b/cookbooks/networking/recipes/default.rb
@@ -185,7 +185,7 @@ template "/etc/shorewall/rules" do
   owner "root"
   group "root"
   mode 0644
-  variables :family => "inet", :rules => []
+  variables :rules => []
   notifies :restart, resources(:service => "shorewall")
 end
 
@@ -196,11 +196,7 @@ firewall_rule "limit-icmp-echo" do
   dest "fw"
   proto "icmp"
   dest_ports "echo-request"
-  if node[:lsb][:release].to_f >= 10.04
-    rate_limit "s:1/sec:5"
-  else
-    rate_limit "1/sec:5"
-  end
+  rate_limit "s:1/sec:5"
 end
 
 [ "ucl", "ic", "bm" ].each do |zone|
@@ -294,7 +290,7 @@ if not node.interfaces(:family => :inet6).empty?
     owner "root"
     group "root"
     mode 0644
-    variables :family => "inet6", :rules => []
+    variables :rules => []
     notifies :restart, resources(:service => "shorewall6")
   end
 
@@ -305,11 +301,7 @@ if not node.interfaces(:family => :inet6).empty?
     dest "fw"
     proto "ipv6-icmp"
     dest_ports "echo-request"
-    if node[:lsb][:release].to_f >= 10.04
-      rate_limit "s:1/sec:5"
-    else
-      rate_limit "1/sec:5"
-    end
+    rate_limit "s:1/sec:5"
   end
 end