Use provisioner type attribute

Vagrant changed the provisioner name attribute to type in version 1.7.1.
This commit is contained in:
Michael K 2014-12-22 21:08:56 +01:00
parent 9f6b615e84
commit 15b0039467

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.keep_if { |p| chef_provisioners.include? p.name } compat_provisioners = provisioners.keep_if { |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."