From: Jonathan Wright Date: Sun, 11 Jan 2015 17:40:42 +0000 (+0000) Subject: Add missing Mask on ip6tables X-Git-Tag: 1.4.0~15^2~1 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1831f7b1e950a79de77a031ac5fcbcb487850f68;p=puppet-modules%2Fpuppetlabs-firewall.git Add missing Mask on ip6tables The :mask option was missing in the ip6tables provider which prevented it from correctly working with the recent module with the following error: Could not evaluate: Parser error: rttl was meant to be a boolean but received value: "--mask." --- diff --git a/lib/puppet/provider/firewall/ip6tables.rb b/lib/puppet/provider/firewall/ip6tables.rb index a42cac3..ce4b5b4 100644 --- a/lib/puppet/provider/firewall/ip6tables.rb +++ b/lib/puppet/provider/firewall/ip6tables.rb @@ -26,6 +26,7 @@ Puppet::Type.type(:firewall).provide :ip6tables, :parent => :iptables, :source = has_feature :iprange has_feature :ipsec_dir has_feature :ipsec_policy + has_feature :mask has_feature :ipset optional_commands({ @@ -85,6 +86,7 @@ Puppet::Type.type(:firewall).provide :ip6tables, :parent => :iptables, :source = :limit => "-m limit --limit", :log_level => "--log-level", :log_prefix => "--log-prefix", + :mask => "--mask", :name => "-m comment --comment", :mac_source => ["-m mac --mac-source", "--mac-source"], :outiface => "-o", @@ -171,7 +173,7 @@ Puppet::Type.type(:firewall).provide :ip6tables, :parent => :iptables, :source = :tcp_flags, :gid, :uid, :mac_source, :sport, :dport, :port, :dst_type, :src_type, :socket, :pkttype, :name, :ipsec_dir, :ipsec_policy, :state, :ctstate, :icmp, :hop_limit, :limit, :burst, :recent, :rseconds, :reap, - :rhitcount, :rttl, :rname, :rsource, :rdest, :ipset, :jump, :todest, + :rhitcount, :rttl, :rname, :mask, :rsource, :rdest, :ipset, :jump, :todest, :tosource, :toports, :log_level, :log_prefix, :reject, :set_mark, :connlimit_above, :connlimit_mask, :connmark]