From 8b186159f3071196240dde4a6db1acce63f78d2b Mon Sep 17 00:00:00 2001 From: Val Markovic Date: Sun, 29 May 2016 10:59:39 -0700 Subject: [PATCH] Unbreak vagrant config for non-parallels The current config has a bug. It wants to set a custom box for the parallels VM provider but instead it overwrites the global config, breaking the virtualbox provider (since that one can't use the parallels box). The correct way to do a per-provider box is with an override param. --- Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 97efc03a29..50f67fb378 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -20,8 +20,8 @@ Vagrant.configure(2) do |config| v.cpus = 2 end - config.vm.provider "parallels" do |v| - config.vm.box = 'parallels/ubuntu-14.04' + config.vm.provider "parallels" do |v, override| + override.vm.box = 'parallels/ubuntu-14.04' v.memory = 3072 v.cpus = 4