From 0026a0ddb4c4e5660cc44c7e80defd4cfcdd3a35 Mon Sep 17 00:00:00 2001 From: Ingmar Steen Date: Mon, 8 Apr 2013 14:29:05 +0200 Subject: [PATCH] (#20125) Use PATH to find (ip|ip6)tables for (ip|ip6)tables provider --- lib/puppet/provider/firewall/ip6tables.rb | 4 ++-- lib/puppet/provider/firewall/iptables.rb | 4 ++-- spec/unit/puppet/provider/iptables_spec.rb | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/puppet/provider/firewall/ip6tables.rb b/lib/puppet/provider/firewall/ip6tables.rb index 121bbb2..74e5688 100644 --- 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 0c1f1f7..545b748 100644 --- 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 b696e20..a82fa6e 100644 --- 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 -- 2.45.2