Merge branch 'release-1.6'

joefitzgerald · Jan 20, 2014 · fa4eb57 · fa4eb57
2 parents 5457471 + 3c96474
commit fa4eb57
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v1.6 (January 20, 2014
+
+* Remove `config.vm.base_mac = "{{ .BaseMacAddress }}"` from vagrantfile templates, ensure SCSI controller is set in VMX (fixes #26)
+
 ## v1.5 (January 9, 2014)
 
 * Fix issue with installation of VM guest tools [GH-23]

diff --git a/vagrantfile-windows_2008_r2.template b/vagrantfile-windows_2008_r2.template
@@ -4,7 +4,6 @@
 Vagrant.configure("2") do |config|
     config.vm.define "vagrant-windows-2008-r2"
     config.vm.box = "windows_2008_r2"
-    config.vm.base_mac = "{{ .BaseMacAddress }}"
 
     # You should be using the vagrant-windows Vagrant Plugin!
     # Admin user name and password
@@ -36,6 +35,7 @@ Vagrant.configure("2") do |config|
         v.vmx["ethernet0.virtualDev"] = "vmxnet3"
         v.vmx["RemoteDisplay.vnc.enabled"] = "false"
         v.vmx["RemoteDisplay.vnc.port"] = "5900"
+        v.vmx["scsi0.virtualDev"] = "lsisas1068"
     end
 
     config.vm.provider :vmware_workstation do |v, override|
@@ -44,5 +44,6 @@ Vagrant.configure("2") do |config|
         v.vmx["ethernet0.virtualDev"] = "vmxnet3"
         v.vmx["RemoteDisplay.vnc.enabled"] = "false"
         v.vmx["RemoteDisplay.vnc.port"] = "5900"
+        v.vmx["scsi0.virtualDev"] = "lsisas1068"
     end
 end
diff --git a/vagrantfile-windows_2012.template b/vagrantfile-windows_2012.template
@@ -4,7 +4,6 @@
 Vagrant.configure("2") do |config|
     config.vm.define "vagrant-windows-2012"
     config.vm.box = "windows_2012"
-    config.vm.base_mac = "{{ .BaseMacAddress }}"
 
     # You should be using the vagrant-windows Vagrant Plugin!
     # Admin user name and password
@@ -36,6 +35,7 @@ Vagrant.configure("2") do |config|
         v.vmx["ethernet0.virtualDev"] = "vmxnet3"
         v.vmx["RemoteDisplay.vnc.enabled"] = "false"
         v.vmx["RemoteDisplay.vnc.port"] = "5900"
+        v.vmx["scsi0.virtualDev"] = "lsisas1068"
     end
 
     config.vm.provider :vmware_workstation do |v, override|
@@ -44,5 +44,6 @@ Vagrant.configure("2") do |config|
         v.vmx["ethernet0.virtualDev"] = "vmxnet3"
         v.vmx["RemoteDisplay.vnc.enabled"] = "false"
         v.vmx["RemoteDisplay.vnc.port"] = "5900"
+        v.vmx["scsi0.virtualDev"] = "lsisas1068"
     end
 end
diff --git a/vagrantfile-windows_2012_r2.template b/vagrantfile-windows_2012_r2.template
@@ -4,7 +4,6 @@
 Vagrant.configure("2") do |config|
     config.vm.define "vagrant-windows-2012-r2"
     config.vm.box = "windows_2012_r2"
-    config.vm.base_mac = "{{ .BaseMacAddress }}"
 
     # You should be using the vagrant-windows Vagrant Plugin!
     # Admin user name and password
@@ -36,6 +35,7 @@ Vagrant.configure("2") do |config|
         v.vmx["ethernet0.virtualDev"] = "vmxnet3"
         v.vmx["RemoteDisplay.vnc.enabled"] = "false"
         v.vmx["RemoteDisplay.vnc.port"] = "5900"
+        v.vmx["scsi0.virtualDev"] = "lsisas1068"
     end
 
     config.vm.provider :vmware_workstation do |v, override|
@@ -44,5 +44,6 @@ Vagrant.configure("2") do |config|
         v.vmx["ethernet0.virtualDev"] = "vmxnet3"
         v.vmx["RemoteDisplay.vnc.enabled"] = "false"
         v.vmx["RemoteDisplay.vnc.port"] = "5900"
+        v.vmx["scsi0.virtualDev"] = "lsisas1068"
     end
 end