update CHANGELOG
This commit is contained in:
parent
087ffa67b2
commit
3476491881
|
@ -9,6 +9,7 @@ BUG FIXES:
|
||||||
- hosts/linux: NFS can be configured without `$TMP` set on the host [GH-5954]
|
- hosts/linux: NFS can be configured without `$TMP` set on the host [GH-5954]
|
||||||
- providers/virtulabox: remove UNC path conversion on Windows since it
|
- providers/virtulabox: remove UNC path conversion on Windows since it
|
||||||
caused mounting regressions [GH-5933]
|
caused mounting regressions [GH-5933]
|
||||||
|
- provisioners/puppet: Windows Puppet 4 paths work correctly [GH-5967]
|
||||||
- provisioners/salt: fix "dummy config" error on bootstrap [GH-5936]
|
- provisioners/salt: fix "dummy config" error on bootstrap [GH-5936]
|
||||||
|
|
||||||
## 1.7.3 (July 10, 2015)
|
## 1.7.3 (July 10, 2015)
|
||||||
|
|
|
@ -146,14 +146,16 @@ module VagrantPlugins
|
||||||
end
|
end
|
||||||
|
|
||||||
def verify_binary(binary)
|
def verify_binary(binary)
|
||||||
|
# Determine the command to use to test whether Puppet is available.
|
||||||
|
# This is very platform dependent.
|
||||||
test_cmd = "sh -c 'command -v #{binary}'"
|
test_cmd = "sh -c 'command -v #{binary}'"
|
||||||
if windows?
|
if windows?
|
||||||
|
test_cmd = "which #{binary}"
|
||||||
if @config.binary_path
|
if @config.binary_path
|
||||||
test_cmd = "where \"#{@config.binary_path}:#{binary}\""
|
test_cmd = "where \"#{@config.binary_path}:#{binary}\""
|
||||||
else
|
|
||||||
test_cmd = "which #{binary}"
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if !machine.communicate.test(test_cmd)
|
if !machine.communicate.test(test_cmd)
|
||||||
@config.binary_path = "/opt/puppetlabs/bin/"
|
@config.binary_path = "/opt/puppetlabs/bin/"
|
||||||
@machine.communicate.sudo(
|
@machine.communicate.sudo(
|
||||||
|
@ -217,9 +219,10 @@ module VagrantPlugins
|
||||||
end
|
end
|
||||||
|
|
||||||
puppet_bin = "puppet"
|
puppet_bin = "puppet"
|
||||||
if(@config.binary_path)
|
if @config.binary_path
|
||||||
puppet_bin = File.join(@config.binary_path, puppet_bin)
|
puppet_bin = File.join(@config.binary_path, puppet_bin)
|
||||||
end
|
end
|
||||||
|
|
||||||
command = "#{facter} #{puppet_bin} apply #{options}"
|
command = "#{facter} #{puppet_bin} apply #{options}"
|
||||||
if config.working_directory
|
if config.working_directory
|
||||||
if windows?
|
if windows?
|
||||||
|
|
Loading…
Reference in New Issue