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

Merge pull request #9690 from briancain/expand_nodes_path_chef 

File path expand all chef_zero config path options
This commit is contained in:
Brian Cain 2018-04-18 13:04:38 -07:00 committed by GitHub
parent 2a79879a41 e8ab85e92b
commit 9f29812db8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/provisioners/chef/config/chef_zero.rb
View File

@ -120,7 +120,7 @@ module VagrantPlugins
# Make sure all the paths are in the proper format # Make sure all the paths are in the proper format
config.map do |path| config.map do |path|
path = [:host, path] if !path.is_a?(Array) path = [:host, File.expand_path(path)] if !path.is_a?(Array)
path path
end end
end end

6
plugins/provisioners/chef/provisioner/chef_zero.rb
View File

@ -62,11 +62,11 @@ module VagrantPlugins
local_mode: true, local_mode: true,
) )
still_active = 259 #provisioner has asked chef to reboot still_active = 259 #provisioner has asked chef to reboot
@config.attempts.times do |attempt| @config.attempts.times do |attempt|
exit_status = 0 exit_status = 0
while exit_status == 0 || exit_status == still_active while exit_status == 0 || exit_status == still_active
if @machine.guest.capability?(:wait_for_reboot) if @machine.guest.capability?(:wait_for_reboot)
@machine.guest.capability(:wait_for_reboot) @machine.guest.capability(:wait_for_reboot)
elsif attempt > 0 elsif attempt > 0