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

passes client cert option from Vagrant file to box_add

This commit is contained in:
Simon Thulbourn 2013-05-23 15:13:04 +01:00
parent 97f9206787
commit ef98c7b8b1
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/vagrant/action/builtin/handle_box_url.rb
View File

@ -27,8 +27,9 @@ module Vagrant
# We can assume a box URL is set because the Vagrantfile # We can assume a box URL is set because the Vagrantfile
# validation should do this for us. If not, though, we do # validation should do this for us. If not, though, we do
# raise a terrible runtime error. # raise a terrible runtime error.
box_name = env[:machine].config.vm.box box_name = env[:machine].config.vm.box
box_url = env[:machine].config.vm.box_url box_url = env[:machine].config.vm.box_url
box_client_cert = env[:machine].config.vm.client_cert
lock.synchronize do lock.synchronize do
# First see if we actually have the box now. # First see if we actually have the box now.
@ -53,9 +54,10 @@ module Vagrant
begin begin
env[:action_runner].run(Vagrant::Action.action_box_add, { env[:action_runner].run(Vagrant::Action.action_box_add, {
:box_name => box_name, :box_name => box_name,
:box_provider => env[:machine].provider_name, :box_provider => env[:machine].provider_name,
:box_url => box_url :box_url => box_url,
:box_client_cert => box_client_cert
}) })
rescue Errors::BoxAlreadyExists rescue Errors::BoxAlreadyExists
# Just ignore this, since it means the next part will succeed! # Just ignore this, since it means the next part will succeed!