From 77a7a7ae6890776d650b866e6645d9f3d9f5eda1 Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Tue, 8 Mar 2016 14:32:11 -0500 Subject: [PATCH] Ensure Vagrant version is at least 1.8.0 Use the Vagrant.require_version helper documented here: https://www.vagrantup.com/docs/vagrantfile/vagrant_version.html Eliminates issues like #238. --- Vagrantfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index b684e106..504a8def 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -7,6 +7,8 @@ def extract_id(env) id[0] end +Vagrant.require_version '>= 1.8.0' + Vagrant.configure(2) do |config| if Vagrant.has_plugin?('vagrant-cachier') @@ -39,9 +41,7 @@ Vagrant.configure(2) do |config| machine.vm.provider :virtualbox do |vbox| # Need extra memory for downloading large files (e.g. Android SDK) vbox.memory = 1024 - if Gem::Version.new(Vagrant::VERSION) >= Gem::Version.new('1.8.0') - vbox.linked_clone = true - end + vbox.linked_clone = true end machine.vm.synced_folder dir, state_root machine.vm.synced_folder File.join(dir, ".travis/test_pillars"), pillar_root