From beea47ce7ebe26b27f3eebe441a2bf411301524b Mon Sep 17 00:00:00 2001
From: Scott Lowe <scott.lowe@scottlowe.org>
Date: Fri, 1 Apr 2016 11:43:14 -0600
Subject: [PATCH] Commit updated multi-platform Vagrant environment

Commit updated machines.yml with Vagrant boxes specified for different platforms. Commit updated Vagrantfile that uses VAGRANT_DEFAULT_PROVIDER environment variable to choose appropriate box.
---
 vagrant-multi-platform/Vagrantfile  | 38 ++++++++++++++++-------------
 vagrant-multi-platform/machines.yml |  7 +++---
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/vagrant-multi-platform/Vagrantfile b/vagrant-multi-platform/Vagrantfile
index ffc4cc5..e4a7b7f 100644
--- a/vagrant-multi-platform/Vagrantfile
+++ b/vagrant-multi-platform/Vagrantfile
@@ -1,12 +1,9 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
-# Specify Vagrant version, Vagrant API version, and Vagrant clone location
-Vagrant.require_version ">= 1.6.0"
-VAGRANTFILE_API_VERSION = "2"
-ENV['VAGRANT_DEFAULT_PROVIDER'] = 'vmware_fusion'
-ENV['VAGRANT_VMWARE_CLONE_DIRECTORY'] = '~/.vagrant'
-#ENV['VAGRANT_DEFAULT_PROVIDER'] = 'virtualbox'
+# Specify Vagrant version and Vagrant API version
+Vagrant.require_version '>= 1.6.0'
+VAGRANTFILE_API_VERSION = '2'
 
 # Require 'yaml' module
 require 'yaml'
@@ -22,27 +19,34 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Iterate through entries in YAML file to create VMs
   machines.each do |machine|
-    config.vm.define machine["name"] do |srv|
+    config.vm.define machine['name'] do |srv|
 
       # Don't check for box updates
       srv.vm.box_check_update = false
-      srv.vm.hostname = machine["name"]
-      platform = "box." + ENV['VAGRANT_DEFAULT_PROVIDER']
-      srv.vm.box = machine[platform]
+      srv.vm.hostname = machine['name']
+
+      # Specify box based on default provider environment variable
+      if ENV['VAGRANT_DEFAULT_PROVIDER'] == 'vmware_fusion'
+        srv.vm.box = machine['vmw_box']
+      elsif ENV['VAGRANT_DEFAULT_PROVIDER'] == 'virtualbox'
+        srv.vm.box = machine['vb_box']
+      else
+      	srv.vm.box = nil
+      end # if ENV['VAGRANT_DEFAULT_PROVIDER']
 
       # Disable default synced folder
-      srv.vm.synced_folder ".", "/vagrant", disabled: true
+      srv.vm.synced_folder '.', '/vagrant', disabled: true
 
       # Configure VMs with RAM and CPUs per machines.yml (Fusion)
-      srv.vm.provider :vmware_fusion do |vmw|
-        vmw.vmx["memsize"] = machine["ram"]
-        vmw.vmx["numvcpus"] = machine["vcpu"]
+      srv.vm.provider 'vmware_fusion' do |vmw|
+        vmw.vmx['memsize'] = machine['ram']
+        vmw.vmx['numvcpus'] = machine['vcpu']
       end # srv.vm.provider vmware_fusion
 
       # Configure the VM with RAM and CPUs per machines.yml (VirtualBox)
-      srv.vm.provider :virtualbox do |vb|
-        vb.memory = machine["ram"]
-        vb.cpus = machine["vcpu"]
+      srv.vm.provider 'virtualbox' do |vb|
+        vb.memory = machine['ram']
+        vb.cpus = machine['vcpu']
       end # srv.vm.provider virtualbox
     end # config.vm.define
   end # machines.each
diff --git a/vagrant-multi-platform/machines.yml b/vagrant-multi-platform/machines.yml
index a0175ed..fee7191 100644
--- a/vagrant-multi-platform/machines.yml
+++ b/vagrant-multi-platform/machines.yml
@@ -1,7 +1,6 @@
 ---
 - name: jessie
-  box:
-    vmware_fusion: slowe/debian-81-x64
-    virtualbox: debian/jessie64
-  ram: 1024
+  vmw_box: slowe/debian-81-x64
+  vb_box: debian/jessie64
+  ram: 512
   vcpu: 1