From: Jason Hancock <jsnbyh@gmail.com>
Date: Thu, 14 Jun 2012 15:21:09 +0000 (-0700)
Subject: (#15038) add gre protocol to list of acceptable protocols
X-Git-Tag: 0.1.0~21^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e010e5b483f6f3b14dd5b1af906c336b43408f32;p=puppet-modules%2Fpuppetlabs-firewall.git

(#15038) add gre protocol to list of acceptable protocols
---

diff --git a/lib/puppet/type/firewall.rb b/lib/puppet/type/firewall.rb
index 5cb9b97..f5f0bf0 100644
--- a/lib/puppet/type/firewall.rb
+++ b/lib/puppet/type/firewall.rb
@@ -209,7 +209,7 @@ Puppet::Type.newtype(:firewall) do
       *tcp*.
     EOS
 
-    newvalues(:tcp, :udp, :icmp, :"ipv6-icmp", :esp, :ah, :vrrp, :igmp, :ipencap, :ospf, :all)
+    newvalues(:tcp, :udp, :icmp, :"ipv6-icmp", :esp, :ah, :vrrp, :igmp, :ipencap, :ospf, :gre, :all)
     defaultto "tcp"
   end
 
diff --git a/spec/unit/puppet/type/firewall_spec.rb b/spec/unit/puppet/type/firewall_spec.rb
index c63994f..0cdb98a 100755
--- 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, :ipencap, :ospf, :all].each do |proto|
+    [:tcp, :udp, :icmp, :esp, :ah, :vrrp, :igmp, :ipencap, :ospf, :gre, :all].each do |proto|
       it "should accept proto value #{proto}" do
         @resource[:proto] = proto
         @resource[:proto].should == proto