Revert of PR 722 to undo the breaking changes introduced

diff --git a/README.markdown b/README.markdown
index 67b04e07ace620ce46dbe054ad098f53aa48d38d..ccf7b9a4fc109dcc1238697af58c137db6f31135 100644 (file)
--- a/README.markdown
+++ b/README.markdown
@@ -703,7 +703,7 @@ firewall { '999 this runs last':
   * 'icmp'
   * 'ipv4'
   * 'ipv6'
-  * 'icmpv6'
+  * 'ipv6-icmp'
   * 'esp'
   * 'ah'
   * 'vrrp'

diff --git a/lib/puppet/type/firewall.rb b/lib/puppet/type/firewall.rb
index 0bdd53e08cc0e6e6a18fec86ffd82775ea38bfff..55065f41f6d3066a8e247839c2d665a84a447e92 100644 (file)
--- a/lib/puppet/type/firewall.rb
+++ b/lib/puppet/type/firewall.rb
@@ -396,7 +396,7 @@ Puppet::Type.newtype(:firewall) do
       *tcp*.
     EOS
 
-    newvalues(*[:ip, :tcp, :udp, :icmp, :icmpv6, :esp, :ah, :vrrp, :igmp, :ipencap, :ipv4, :ipv6, :ospf, :gre, :cbt, :sctp, :pim, :all].collect do |proto|
+    newvalues(*[:ip, :tcp, :udp, :icmp, :"ipv6-icmp", :esp, :ah, :vrrp, :igmp, :ipencap, :ipv4, :ipv6, :ospf, :gre, :cbt, :sctp, :pim, :all].collect do |proto|
       [proto, "! #{proto}".to_sym]
     end.flatten)
     defaultto "tcp"