diff --git a/Vagrantfile b/Vagrantfile index ebe5693..de71652 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -16,13 +16,9 @@ SSH_FORWARD = settings['SSH_FORWARD'] || false # Default to shell environment variable: PLAYBOOK (priority #1) PLAYBOOK=ENV["PLAYBOOK"] -if !PLAYBOOK +if !PLAYBOOK || PLAYBOOK.empty? # PLAYBOOK setting in .vagrant.yml (priority #2) PLAYBOOK = settings['PLAYBOOK'] || false - if !PLAYBOOK || PLAYBOOK.empty? - puts "[VAGRANTFILE ERROR]: Set PLAYBOOK setting in .vagrant.yml" - abort - end end Vagrant.configure("2") do |config| @@ -31,10 +27,10 @@ Vagrant.configure("2") do |config| config.ssh.forward_agent = SSH_FORWARD # Libvrit provider - config.vm.provider :libvirt do |libvirt| - libvirt.cpus = VAGRANT_CPUS - libvirt.memory = VAGRANT_MEM - end + #config.vm.provider :libvirt do |libvirt| + # libvirt.cpus = VAGRANT_CPUS + # libvirt.memory = VAGRANT_MEM + #end # Virtualbox provider config.vm.provider :virtualbox do |vbox|