From: Jared Meyering Date: Tue, 14 Jul 2015 16:35:04 +0000 (-0500) Subject: facter 4 compat X-Git-Tag: 1.7.0~7^2~1 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=38c66d5fb2dabc96b4f78186ecd712743232c36d;p=puppet-modules%2Fpuppetlabs-firewall.git facter 4 compat --- diff --git a/lib/puppet/provider/firewall/ip6tables.rb b/lib/puppet/provider/firewall/ip6tables.rb index 2a05dcf..bb8d3e9 100644 --- a/lib/puppet/provider/firewall/ip6tables.rb +++ b/lib/puppet/provider/firewall/ip6tables.rb @@ -37,7 +37,7 @@ Puppet::Type.type(:firewall).provide :ip6tables, :parent => :iptables, :source = confine :kernel => :linux - ip6tables_version = Facter.fact('ip6tables_version').value + ip6tables_version = Facter.value('ip6tables_version') if (ip6tables_version and Puppet::Util::Package.versioncmp(ip6tables_version, '1.4.1') < 0) mark_flag = '--set-mark' else diff --git a/lib/puppet/provider/firewall/iptables.rb b/lib/puppet/provider/firewall/iptables.rb index fcf9373..a83915d 100644 --- a/lib/puppet/provider/firewall/iptables.rb +++ b/lib/puppet/provider/firewall/iptables.rb @@ -42,7 +42,7 @@ Puppet::Type.type(:firewall).provide :iptables, :parent => Puppet::Provider::Fir defaultfor :kernel => :linux confine :kernel => :linux - iptables_version = Facter.fact('iptables_version').value + iptables_version = Facter.value('iptables_version') if (iptables_version and Puppet::Util::Package.versioncmp(iptables_version, '1.4.1') < 0) mark_flag = '--set-mark' else diff --git a/lib/puppet/type/firewall.rb b/lib/puppet/type/firewall.rb index 35c699b..a64c2fa 100644 --- a/lib/puppet/type/firewall.rb +++ b/lib/puppet/type/firewall.rb @@ -841,7 +841,7 @@ Puppet::Type.newtype(:firewall) do end # Old iptables does not support a mask. New iptables will expect one. - iptables_version = Facter.fact('iptables_version').value + iptables_version = Facter.value('iptables_version') mask_required = (iptables_version and Puppet::Util::Package.versioncmp(iptables_version, '1.4.1') >= 0) if mask_required