Merge pull request puppetlabs#559 from BlendMarketing/master

Compatibility with Puppet 4 and Facter 3
cegeka · Jul 20, 2015 · cf4d9b7 · cf4d9b7
2 parents c621a64 + 72d5af9
commit cf4d9b7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/lib/puppet/provider/firewall/ip6tables.rb b/lib/puppet/provider/firewall/ip6tables.rb
@@ -37,7 +37,7 @@
 
   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
@@ -42,7 +42,7 @@
   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
@@ -841,7 +841,7 @@ def insync?(is)
       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