Merge remote-tracking branch 'github/pull/451'

[chef.git] / cookbooks / networking / resources / firewall_rule.rb

diff --git a/cookbooks/networking/resources/firewall_rule.rb b/cookbooks/networking/resources/firewall_rule.rb
index 348272af7ccef03fda8ad50f9b2d9883e75627fd..a3e2e7eb0bb0816cf37dde3be25892199958a1a0 100644 (file)
--- a/cookbooks/networking/resources/firewall_rule.rb
+++ b/cookbooks/networking/resources/firewall_rule.rb
@@ -20,6 +20,8 @@
 resource_name :firewall_rule
 provides :firewall_rule
 
+unified_mode true
+
 default_action :nothing
 
 property :rule, :kind_of => String, :name_property => true
@@ -30,9 +32,11 @@ property :proto, :kind_of => String, :required => true
 property :dest_ports, :kind_of => [String, Integer], :default => "-"
 property :source_ports, :kind_of => [String, Integer], :default => "-"
 property :rate_limit, :kind_of => String, :default => "-"
-property :connection_limit, :kind_of => String, :default => "-"
+property :connection_limit, :kind_of => [String, Integer], :default => "-"
 property :helper, :kind_of => String, :default => "-"
 
+property :compile_time, TrueClass, :default => true
+
 action :accept do
   add_rule :accept
 end
@@ -55,7 +59,7 @@ action_class do
       :dest_ports => new_resource.dest_ports.to_s,
       :source_ports => new_resource.source_ports.to_s,
       :rate_limit => new_resource.rate_limit,
-      :connection_limit => new_resource.connection_limit,
+      :connection_limit => new_resource.connection_limit.to_s,
       :helper => new_resource.helper
     }