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

provisioners/chef: don't check existing set, unique ID 

[GH-5199]
This commit is contained in:
Mitchell Hashimoto 2015-07-09 14:03:38 -06:00
parent b49d25c56c
commit 300b9c9109
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/provisioners/chef/provisioner/chef_solo.rb
View File

@ -125,13 +125,23 @@ module VagrantPlugins
# If this folder already exists, then we don't share it, it means # If this folder already exists, then we don't share it, it means
# it was already put down on disk. # it was already put down on disk.
#
# NOTE: This is currently commented out because it was causing
# major bugs (GH-5199). We will investigate why this is in more
# detail for 1.8.0, but we wanted to fix this in a patch release
# and this was the hammer that did that.
=begin
if existing_set.include?(remote_path) if existing_set.include?(remote_path)
@logger.debug("Not sharing #{local_path}, exists as #{remote_path}") @logger.debug("Not sharing #{local_path}, exists as #{remote_path}")
next next
end end
=end
key = Digest::MD5.hexdigest(remote_path)
key = key[0..8]
opts = {} opts = {}
opts[:id] = "v-#{prefix}-#{self.class.get_and_update_counter(:shared_folder)}" opts[:id] = "v-#{prefix}-#{key}"
opts[:type] = @config.synced_folder_type if @config.synced_folder_type opts[:type] = @config.synced_folder_type if @config.synced_folder_type
root_config.vm.synced_folder(local_path, remote_path, opts) root_config.vm.synced_folder(local_path, remote_path, opts)

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

@ -84,8 +84,9 @@ module VagrantPlugins
key = Digest::MD5.hexdigest(local_path) key = Digest::MD5.hexdigest(local_path)
remote_path = "#{@config.provisioning_path}/#{key}" remote_path = "#{@config.provisioning_path}/#{key}"
else else
@machine.ui.warn(I18n.t("vagrant.provisioners.chef.cookbook_folder_not_found_warning", @machine.ui.warn(I18n.t(
path: local_path.to_s)) "vagrant.provisioners.chef.cookbook_folder_not_found_warning",
path: local_path.to_s))
next next
end end
else else
@ -125,13 +126,23 @@ module VagrantPlugins
# If this folder already exists, then we don't share it, it means # If this folder already exists, then we don't share it, it means
# it was already put down on disk. # it was already put down on disk.
#
# NOTE: This is currently commented out because it was causing
# major bugs (GH-5199). We will investigate why this is in more
# detail for 1.8.0, but we wanted to fix this in a patch release
# and this was the hammer that did that.
=begin
if existing_set.include?(remote_path) if existing_set.include?(remote_path)
@logger.debug("Not sharing #{local_path}, exists as #{remote_path}") @logger.debug("Not sharing #{local_path}, exists as #{remote_path}")
next next
end end
=end
key = Digest::MD5.hexdigest(remote_path)
key = key[0..8]
opts = {} opts = {}
opts[:id] = "v-#{prefix}-#{self.class.get_and_update_counter(:shared_folder)}" opts[:id] = "v-#{prefix}-#{key}"
opts[:type] = @config.synced_folder_type if @config.synced_folder_type opts[:type] = @config.synced_folder_type if @config.synced_folder_type
root_config.vm.synced_folder(local_path, remote_path, opts) root_config.vm.synced_folder(local_path, remote_path, opts)