haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix resolution of puppet path for <4.0

This commit is contained in:
Ben Hines 2015-04-12 12:29:50 -07:00
parent b40426aca5
commit 0efb9a3932
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/provisioners/puppet/provisioner/puppet.rb
View File

@ -145,12 +145,12 @@ module VagrantPlugins
def verify_binary(binary) def verify_binary(binary)
if !machine.communicate.test("sh -c 'command -v #{binary}'") if !machine.communicate.test("sh -c 'command -v #{binary}'")
@config.binary_path = "/opt/puppetlabs/bin" @config.binary_path = "/opt/puppetlabs/bin/"
@machine.communicate.sudo( @machine.communicate.sudo(
"test -x /opt/puppetlabs/bin/#{binary}", "test -x /opt/puppetlabs/bin/#{binary}",
error_class: PuppetError, error_class: PuppetError,
error_key: :not_detected, error_key: :not_detected,
binary: binary) binary: binary)
end end
end end
@ -208,7 +208,7 @@ module VagrantPlugins
facter = "#{facts.join(" ")} " facter = "#{facts.join(" ")} "
end end
command = "#{facter} #{config.binary_path}/puppet apply #{options}" command = "#{facter} #{config.binary_path}puppet apply #{options}"
if config.working_directory if config.working_directory
if windows? if windows?
command = "cd #{config.working_directory}; if (`$?) \{ #{command} \}" command = "cd #{config.working_directory}; if (`$?) \{ #{command} \}"