Merge branch 'release-1.18'

Author: joefitzgerald

CHANGELOG.md

@@ -1,3 +1,8 @@
+## v1.18 (May 16th, 2014)
+* Require Vagrant 1.6.2 (#57)
+* Remove WinRM port forward, as it's done automatically in Vagrant 1.6.2+ (#57)
+* Update chef-client source to getchef.com (#63)
+
 ## v1.16 (May 7th, 2014)
 
 * Fix VirtualBox ISO URLs

scripts/chef.bat

@@ -1,5 +1,5 @@
 if not exist "C:\Windows\Temp\chef.msi" (
-  powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://www.opscode.com/chef/install.msi', 'C:\Windows\Temp\chef.msi')" <NUL
+  powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://www.getchef.com/chef/install.msi', 'C:\Windows\Temp\chef.msi')" <NUL
 )
 
 msiexec /qb /i C:\Windows\Temp\chef.msi

vagrantfile-windows_2008_r2.template

@@ -1,16 +1,12 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+Vagrant.require_version ">= 1.6.2"
+
 Vagrant.configure("2") do |config|
     config.vm.define "vagrant-windows-2008-r2"
     config.vm.box = "windows_2008_r2"
-
-    if !Vagrant.has_plugin?('vagrant-windows')
-      puts "vagrant-windows missing, please install the vagrant-windows plugin!"
-      puts "Run this command in your terminal:"
-      puts "vagrant plugin install vagrant-windows"
-      exit 1
-    end
+    config.vm.communicator = "winrm"
 
     # Admin user name and password
     config.winrm.username = "vagrant"
@@ -19,17 +15,20 @@ Vagrant.configure("2") do |config|
     config.vm.guest = :windows
     config.windows.halt_timeout = 15
 
-    config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true
+    config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct: true
+
 
     config.vm.provider :virtualbox do |v, override|
         #v.gui = true
         v.customize ["modifyvm", :id, "--memory", 2048]
         v.customize ["modifyvm", :id, "--cpus", 2]
+        v.customize ["setextradata", "global", "GUI/SuppressMessages", "all" ]
     end
 
     config.vm.provider :vmware_fusion do |v, override|
         #v.gui = true
         v.vmx["memsize"] = "2048"
+        v.vmx["numvcpus"] = "2"
         v.vmx["ethernet0.virtualDev"] = "vmxnet3"
         v.vmx["RemoteDisplay.vnc.enabled"] = "false"
         v.vmx["RemoteDisplay.vnc.port"] = "5900"
@@ -39,6 +38,7 @@ Vagrant.configure("2") do |config|
     config.vm.provider :vmware_workstation do |v, override|
         #v.gui = true
         v.vmx["memsize"] = "2048"
+        v.vmx["numvcpus"] = "2"
         v.vmx["ethernet0.virtualDev"] = "vmxnet3"
         v.vmx["RemoteDisplay.vnc.enabled"] = "false"
         v.vmx["RemoteDisplay.vnc.port"] = "5900"

vagrantfile-windows_2012.template

@@ -1,16 +1,12 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+Vagrant.require_version ">= 1.6.2"
+
 Vagrant.configure("2") do |config|
     config.vm.define "vagrant-windows-2012"
     config.vm.box = "windows_2012"
-
-    if !Vagrant.has_plugin?('vagrant-windows')
-      puts "vagrant-windows missing, please install the vagrant-windows plugin!"
-      puts "Run this command in your terminal:"
-      puts "vagrant plugin install vagrant-windows"
-      exit 1
-    end
+    config.vm.communicator = "winrm"
 
     # Admin user name and password
     config.winrm.username = "vagrant"
@@ -19,17 +15,19 @@ Vagrant.configure("2") do |config|
     config.vm.guest = :windows
     config.windows.halt_timeout = 15
 
-    config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true
+    config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct: true
 
     config.vm.provider :virtualbox do |v, override|
         #v.gui = true
         v.customize ["modifyvm", :id, "--memory", 2048]
         v.customize ["modifyvm", :id, "--cpus", 2]
+        v.customize ["setextradata", "global", "GUI/SuppressMessages", "all" ]
     end
 
     config.vm.provider :vmware_fusion do |v, override|
         #v.gui = true
         v.vmx["memsize"] = "2048"
+        v.vmx["numvcpus"] = "2"
         v.vmx["ethernet0.virtualDev"] = "vmxnet3"
         v.vmx["RemoteDisplay.vnc.enabled"] = "false"
         v.vmx["RemoteDisplay.vnc.port"] = "5900"
@@ -39,6 +37,7 @@ Vagrant.configure("2") do |config|
     config.vm.provider :vmware_workstation do |v, override|
         #v.gui = true
         v.vmx["memsize"] = "2048"
+        v.vmx["numvcpus"] = "2"
         v.vmx["ethernet0.virtualDev"] = "vmxnet3"
         v.vmx["RemoteDisplay.vnc.enabled"] = "false"
         v.vmx["RemoteDisplay.vnc.port"] = "5900"

vagrantfile-windows_2012_r2.template

@@ -1,16 +1,12 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+Vagrant.require_version ">= 1.6.2"
+
 Vagrant.configure("2") do |config|
     config.vm.define "vagrant-windows-2012-r2"
     config.vm.box = "windows_2012_r2"
-
-    if !Vagrant.has_plugin?('vagrant-windows')
-      puts "vagrant-windows missing, please install the vagrant-windows plugin!"
-      puts "Run this command in your terminal:"
-      puts "vagrant plugin install vagrant-windows"
-      exit 1
-    end
+    config.vm.communicator = "winrm"
 
     # Admin user name and password
     config.winrm.username = "vagrant"
@@ -19,17 +15,19 @@ Vagrant.configure("2") do |config|
     config.vm.guest = :windows
     config.windows.halt_timeout = 15
 
-    config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true
+    config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct: true
 
     config.vm.provider :virtualbox do |v, override|
         #v.gui = true
         v.customize ["modifyvm", :id, "--memory", 2048]
         v.customize ["modifyvm", :id, "--cpus", 2]
+        v.customize ["setextradata", "global", "GUI/SuppressMessages", "all" ]
     end
 
     config.vm.provider :vmware_fusion do |v, override|
         #v.gui = true
         v.vmx["memsize"] = "2048"
+        v.vmx["numvcpus"] = "2"
         v.vmx["ethernet0.virtualDev"] = "vmxnet3"
         v.vmx["RemoteDisplay.vnc.enabled"] = "false"
         v.vmx["RemoteDisplay.vnc.port"] = "5900"
@@ -39,6 +37,7 @@ Vagrant.configure("2") do |config|
     config.vm.provider :vmware_workstation do |v, override|
         #v.gui = true
         v.vmx["memsize"] = "2048"
+        v.vmx["numvcpus"] = "2"
         v.vmx["ethernet0.virtualDev"] = "vmxnet3"
         v.vmx["RemoteDisplay.vnc.enabled"] = "false"
         v.vmx["RemoteDisplay.vnc.port"] = "5900"

vagrantfile-windows_7.template

@@ -1,16 +1,12 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+Vagrant.require_version ">= 1.6.2"
+
 Vagrant.configure("2") do |config|
     config.vm.define "vagrant-windows-7"
     config.vm.box = "windows_7"
-
-    if !Vagrant.has_plugin?('vagrant-windows')
-      puts "vagrant-windows missing, please install the vagrant-windows plugin!"
-      puts "Run this command in your terminal:"
-      puts "vagrant plugin install vagrant-windows"
-      exit 1
-    end
+    config.vm.communicator = "winrm"
 
     # Admin user name and password
     config.winrm.username = "vagrant"
@@ -19,17 +15,19 @@ Vagrant.configure("2") do |config|
     config.vm.guest = :windows
     config.windows.halt_timeout = 15
 
-    config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true
+    config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct: true
 
     config.vm.provider :virtualbox do |v, override|
         #v.gui = true
         v.customize ["modifyvm", :id, "--memory", 2048]
         v.customize ["modifyvm", :id, "--cpus", 2]
+        v.customize ["setextradata", "global", "GUI/SuppressMessages", "all" ]
     end
 
     config.vm.provider :vmware_fusion do |v, override|
         #v.gui = true
         v.vmx["memsize"] = "2048"
+        v.vmx["numvcpus"] = "2"
         v.vmx["ethernet0.virtualDev"] = "vmxnet3"
         v.vmx["RemoteDisplay.vnc.enabled"] = "false"
         v.vmx["RemoteDisplay.vnc.port"] = "5900"
@@ -39,6 +37,7 @@ Vagrant.configure("2") do |config|
     config.vm.provider :vmware_workstation do |v, override|
         #v.gui = true
         v.vmx["memsize"] = "2048"
+        v.vmx["numvcpus"] = "2"
         v.vmx["ethernet0.virtualDev"] = "vmxnet3"
         v.vmx["RemoteDisplay.vnc.enabled"] = "false"
         v.vmx["RemoteDisplay.vnc.port"] = "5900"

vagrantfile-windows_81.template

@@ -1,16 +1,12 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+Vagrant.require_version ">= 1.6.2"
+
 Vagrant.configure("2") do |config|
     config.vm.define "vagrant-windows-81"
     config.vm.box = "windows_81"
-
-    if !Vagrant.has_plugin?('vagrant-windows')
-      puts "vagrant-windows missing, please install the vagrant-windows plugin!"
-      puts "Run this command in your terminal:"
-      puts "vagrant plugin install vagrant-windows"
-      exit 1
-    end
+    config.vm.communicator = "winrm"
 
     # Admin user name and password
     config.winrm.username = "vagrant"
@@ -19,17 +15,19 @@ Vagrant.configure("2") do |config|
     config.vm.guest = :windows
     config.windows.halt_timeout = 15
 
-    config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true
+    config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct: true
 
     config.vm.provider :virtualbox do |v, override|
         #v.gui = true
         v.customize ["modifyvm", :id, "--memory", 2048]
         v.customize ["modifyvm", :id, "--cpus", 2]
+        v.customize ["setextradata", "global", "GUI/SuppressMessages", "all" ]
     end
 
     config.vm.provider :vmware_fusion do |v, override|
         #v.gui = true
         v.vmx["memsize"] = "2048"
+        v.vmx["numvcpus"] = "2"
         v.vmx["ethernet0.virtualDev"] = "vmxnet3"
         v.vmx["RemoteDisplay.vnc.enabled"] = "false"
         v.vmx["RemoteDisplay.vnc.port"] = "5900"
@@ -39,6 +37,7 @@ Vagrant.configure("2") do |config|
     config.vm.provider :vmware_workstation do |v, override|
         #v.gui = true
         v.vmx["memsize"] = "2048"
+        v.vmx["numvcpus"] = "2"
         v.vmx["ethernet0.virtualDev"] = "vmxnet3"
         v.vmx["RemoteDisplay.vnc.enabled"] = "false"
         v.vmx["RemoteDisplay.vnc.port"] = "5900"