glenux/vagrant-cachier-ng
glenux/vagrant-cachier-ng
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'vagrant_1-7-1_fix' of https://github.com/Yserz/vagrant-cachier

Browse source 
Conflicts:
	lib/vagrant-cachier/cap/linux/chef_file_cache_path.rb
This commit is contained in:
Fabio Rehm 2015-01-14 23:04:32 -02:00
parent e227077008 15b0039467
commit 00e2d858da
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/vagrant-cachier/cap/linux/chef_file_cache_path.rb
View file

@ -6,7 +6,7 @@ module VagrantPlugins
def self.chef_provisioner?(machine) def self.chef_provisioner?(machine)
provisioners = machine.config.vm.provisioners provisioners = machine.config.vm.provisioners
chef_provisioners = [:chef_solo, :chef_client] chef_provisioners = [:chef_solo, :chef_client]
compat_provisioners = provisioners.select { |p| chef_provisioners.include? p.name } compat_provisioners = provisioners.select { |p| chef_provisioners.include? p.name || p.type }
if compat_provisioners.size > 1 if compat_provisioners.size > 1
raise "One machine is using multiple chef provisioners, which is unsupported." raise "One machine is using multiple chef provisioners, which is unsupported."