Merge branch 'patch-1' of https://github.com/cassianoleal/vagrant-cachier
This commit is contained in:
commit
e227077008
1 changed files with 1 additions and 1 deletions
|
@ -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.select { |p| chef_provisioners.include? p.name }
|
||||||
|
|
||||||
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."
|
||||||
|
|
Loading…
Reference in a new issue