(#10997) Add ipencap (protocol 4) support to firewall type property 'proto'

This change adds ipencap as a viable option, and adds it to tests as well.

diff --git a/lib/puppet/type/firewall.rb b/lib/puppet/type/firewall.rb
index 8fcb1f66cfd4934485f17c2217d70d3576eccb55..e6bd0d38632344412c59fbba537b2777105086a2 100644 (file)
--- a/lib/puppet/type/firewall.rb
+++ b/lib/puppet/type/firewall.rb
@@ -183,7 +183,7 @@ Puppet::Type.newtype(:firewall) do
       *tcp*.
     EOS
 
-    newvalues(:tcp, :udp, :icmp, :"ipv6-icmp", :esp, :ah, :vrrp, :igmp, :all)
+    newvalues(:tcp, :udp, :icmp, :"ipv6-icmp", :esp, :ah, :vrrp, :igmp, :ipencap, :all)
     defaultto "tcp"
   end
 

diff --git a/spec/unit/puppet/type/firewall_spec.rb b/spec/unit/puppet/type/firewall_spec.rb
index 7352a0769e9878da530dad29149d11da7675db16..c08d6ab5e8bc867b742a03cf3cc51f576aa40931 100644 (file)
--- a/spec/unit/puppet/type/firewall_spec.rb
+++ b/spec/unit/puppet/type/firewall_spec.rb
@@ -74,7 +74,7 @@ describe firewall do
   end
 
   describe ':proto' do
-    [:tcp, :udp, :icmp, :esp, :ah, :vrrp, :igmp, :all].each do |proto|
+    [:tcp, :udp, :icmp, :esp, :ah, :vrrp, :igmp, :ipencap, :all].each do |proto|
       it "should accept proto value #{proto}" do
         @resource[:proto] = proto
         @resource[:proto].should == proto