Merge pull request #505 from jpds/ipv4-encap

Added ipv{4,6} to protocol list
redhat-openstack · Apr 1, 2015 · e7121fe · e7121fe
2 parents 317ee17 + a640a43
commit e7121fe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/README.markdown b/README.markdown
@@ -564,6 +564,8 @@ firewall { '999 this runs last':
   * 'tcp'
   * 'udp'
   * 'icmp'
+  * 'ipv4'
+  * 'ipv6'
   * 'ipv6-icmp'
   * 'esp'
   * 'ah'

diff --git a/lib/puppet/type/firewall.rb b/lib/puppet/type/firewall.rb
@@ -356,7 +356,7 @@ def should_to_s(value)
       *tcp*.
     EOS
 
-    newvalues(*[:tcp, :udp, :icmp, :"ipv6-icmp", :esp, :ah, :vrrp, :igmp, :ipencap, :ospf, :gre, :cbt, :all].collect do |proto|
+    newvalues(*[:tcp, :udp, :icmp, :"ipv6-icmp", :esp, :ah, :vrrp, :igmp, :ipencap, :ipv4, :ipv6, :ospf, :gre, :cbt, :all].collect do |proto|
       [proto, "! #{proto}".to_sym]
     end.flatten)
     defaultto "tcp"

diff --git a/spec/unit/puppet/type/firewall_spec.rb b/spec/unit/puppet/type/firewall_spec.rb
@@ -82,7 +82,7 @@
   end
 
   describe ':proto' do
-    [:tcp, :udp, :icmp, :esp, :ah, :vrrp, :igmp, :ipencap, :ospf, :gre, :all].each do |proto|
+    [:tcp, :udp, :icmp, :esp, :ah, :vrrp, :igmp, :ipencap, :ipv4, :ipv6, :ospf, :gre, :all].each do |proto|
       it "should accept proto value #{proto}" do
         @resource[:proto] = proto
         @resource[:proto].should == proto