(#20125) Use PATH to find (ip|ip6)tables for (ip|ip6)tables provider

diff --git a/lib/puppet/provider/firewall/ip6tables.rb b/lib/puppet/provider/firewall/ip6tables.rb
index 121bbb218d65f33efa86b3a262e7824a5c8d1f71..74e568808d134ed3bb4b06cd39015cbc9011ab65 100644 (file)
--- a/lib/puppet/provider/firewall/ip6tables.rb
+++ b/lib/puppet/provider/firewall/ip6tables.rb
@@ -17,8 +17,8 @@ Puppet::Type.type(:firewall).provide :ip6tables, :parent => :iptables, :source =
   has_feature :pkttype
 
   optional_commands({
-    :ip6tables      => '/sbin/ip6tables',
-    :ip6tables_save => '/sbin/ip6tables-save',
+    :ip6tables      => 'ip6tables',
+    :ip6tables_save => 'ip6tables-save',
   })
 
   def self.iptables(*args)

diff --git a/lib/puppet/provider/firewall/iptables.rb b/lib/puppet/provider/firewall/iptables.rb
index 0c1f1f7a690b2fce6530b5da509cf9356f913035..545b748428b9e9667faa6755ff1e85848c2f9a3b 100644 (file)
--- a/lib/puppet/provider/firewall/iptables.rb
+++ b/lib/puppet/provider/firewall/iptables.rb
@@ -23,8 +23,8 @@ Puppet::Type.type(:firewall).provide :iptables, :parent => Puppet::Provider::Fir
   has_feature :socket
 
   optional_commands({
-    :iptables => '/sbin/iptables',
-    :iptables_save => '/sbin/iptables-save',
+    :iptables => 'iptables',
+    :iptables_save => 'iptables-save',
   })
 
   defaultfor :kernel => :linux

diff --git a/spec/unit/puppet/provider/iptables_spec.rb b/spec/unit/puppet/provider/iptables_spec.rb
index b696e20616d1a31b9ef2457ba6476bc5f569ebcb..a82fa6e274f007372d35754aefc51e26b426ec1a 100644 (file)
--- a/spec/unit/puppet/provider/iptables_spec.rb
+++ b/spec/unit/puppet/provider/iptables_spec.rb
@@ -15,15 +15,15 @@ describe 'iptables provider detection' do
 
   it "should default to iptables provider if /sbin/iptables[-save] exists" do
     # Stub lookup for /sbin/iptables & /sbin/iptables-save
-    exists.any_instance.stubs(:which).with("/sbin/iptables").
+    exists.any_instance.stubs(:which).with("iptables").
       returns "/sbin/iptables"
-    exists.any_instance.stubs(:which).with("/sbin/iptables-save").
+    exists.any_instance.stubs(:which).with("iptables-save").
       returns "/sbin/iptables-save"
 
     # Every other command should return false so we don't pick up any
     # other providers
     exists.any_instance.stubs(:which).with() { |value|
-      ! ["/sbin/iptables","/sbin/iptables-save"].include?(value)
+      ! ["iptables","iptables-save"].include?(value)
     }.returns false
 
     # Create a resource instance and make sure the provider is iptables
@@ -51,7 +51,7 @@ describe 'iptables provider' do
     Facter.fact(:iptables_version).stubs(:value).returns("1.4.2")
 
     Puppet::Util::Execution.stubs(:execute).returns ""
-    Puppet::Util.stubs(:which).with("/sbin/iptables-save").
+    Puppet::Util.stubs(:which).with("iptables-save").
       returns "/sbin/iptables-save"
   end