From 72f6656f08b952c8819485894b67df668f61d85a Mon Sep 17 00:00:00 2001 From: Blair Hamilton Date: Wed, 7 May 2014 13:05:50 -0400 Subject: [PATCH 1/7] Update vagrantfile-windows_2008_r2.template --- vagrantfile-windows_2008_r2.template | 7 ------- 1 file changed, 7 deletions(-) diff --git a/vagrantfile-windows_2008_r2.template b/vagrantfile-windows_2008_r2.template index 902824ff..d2732a52 100644 --- a/vagrantfile-windows_2008_r2.template +++ b/vagrantfile-windows_2008_r2.template @@ -5,13 +5,6 @@ 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 - # Admin user name and password config.winrm.username = "vagrant" config.winrm.password = "vagrant" From a85c44a465d08e590bb0aae4327c117a4f8651da Mon Sep 17 00:00:00 2001 From: Blair Hamilton Date: Wed, 7 May 2014 13:15:56 -0400 Subject: [PATCH 2/7] Update vagrantfile-windows_2008_r2.template --- vagrantfile-windows_2008_r2.template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vagrantfile-windows_2008_r2.template b/vagrantfile-windows_2008_r2.template index d2732a52..a75b1f42 100644 --- a/vagrantfile-windows_2008_r2.template +++ b/vagrantfile-windows_2008_r2.template @@ -23,6 +23,7 @@ Vagrant.configure("2") do |config| 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" @@ -32,6 +33,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" From f06e0a294ef18a92577401421b8e32691d7ba8eb Mon Sep 17 00:00:00 2001 From: Blair Hamilton Date: Wed, 7 May 2014 22:33:21 -0400 Subject: [PATCH 3/7] Updating for Vagrant 1.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removed the requirement for the vagrant-windows plugin added the port forwarding for rdp disabling the GUI Message for virtualbox gave vmmare 2 cpu’s to match virtualbox --- vagrantfile-windows_2008_r2.template | 7 ++++++- vagrantfile-windows_2012.template | 14 +++++++------- vagrantfile-windows_2012_r2.template | 14 +++++++------- vagrantfile-windows_7.template | 14 +++++++------- vagrantfile-windows_81.template | 14 +++++++------- 5 files changed, 34 insertions(+), 29 deletions(-) diff --git a/vagrantfile-windows_2008_r2.template b/vagrantfile-windows_2008_r2.template index a75b1f42..910d0bf9 100644 --- a/vagrantfile-windows_2008_r2.template +++ b/vagrantfile-windows_2008_r2.template @@ -1,9 +1,12 @@ # -*- mode: ruby -*- # vi: set ft=ruby : +Vagrant.require_version ">= 1.6.0" + Vagrant.configure("2") do |config| config.vm.define "vagrant-windows-2008-r2" config.vm.box = "windows_2008_r2" + config.vm.communicator = "winrm" # Admin user name and password config.winrm.username = "vagrant" @@ -13,11 +16,13 @@ Vagrant.configure("2") do |config| 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| @@ -39,4 +44,4 @@ Vagrant.configure("2") do |config| v.vmx["RemoteDisplay.vnc.port"] = "5900" v.vmx["scsi0.virtualDev"] = "lsisas1068" end -end +end \ No newline at end of file diff --git a/vagrantfile-windows_2012.template b/vagrantfile-windows_2012.template index 156e06b8..842351c9 100644 --- a/vagrantfile-windows_2012.template +++ b/vagrantfile-windows_2012.template @@ -1,16 +1,12 @@ # -*- mode: ruby -*- # vi: set ft=ruby : +Vagrant.require_version ">= 1.6.0" + 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" @@ -20,16 +16,19 @@ Vagrant.configure("2") do |config| 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" diff --git a/vagrantfile-windows_2012_r2.template b/vagrantfile-windows_2012_r2.template index 2ee15f7a..0781adce 100644 --- a/vagrantfile-windows_2012_r2.template +++ b/vagrantfile-windows_2012_r2.template @@ -1,16 +1,12 @@ # -*- mode: ruby -*- # vi: set ft=ruby : +Vagrant.require_version ">= 1.6.0" + 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" @@ -20,16 +16,19 @@ Vagrant.configure("2") do |config| 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" diff --git a/vagrantfile-windows_7.template b/vagrantfile-windows_7.template index 40600564..3d73475a 100644 --- a/vagrantfile-windows_7.template +++ b/vagrantfile-windows_7.template @@ -1,16 +1,12 @@ # -*- mode: ruby -*- # vi: set ft=ruby : +Vagrant.require_version ">= 1.6.0" + 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" @@ -20,16 +16,19 @@ Vagrant.configure("2") do |config| 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" diff --git a/vagrantfile-windows_81.template b/vagrantfile-windows_81.template index 16173e27..2043f079 100644 --- a/vagrantfile-windows_81.template +++ b/vagrantfile-windows_81.template @@ -1,16 +1,12 @@ # -*- mode: ruby -*- # vi: set ft=ruby : +Vagrant.require_version ">= 1.6.0" + 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" @@ -20,16 +16,19 @@ Vagrant.configure("2") do |config| 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" From 9676242692b4c07f137dd560ffe2295ebaadf75a Mon Sep 17 00:00:00 2001 From: Blair Hamilton Date: Thu, 15 May 2014 11:57:08 -0400 Subject: [PATCH 4/7] Removed the port forward for RDP This can cause problems for windows users and is fixed in vagrant 1.6.2 --- vagrantfile-windows_2008_r2.template | 1 - vagrantfile-windows_2012.template | 1 - vagrantfile-windows_2012_r2.template | 1 - vagrantfile-windows_7.template | 1 - vagrantfile-windows_81.template | 1 - 5 files changed, 5 deletions(-) diff --git a/vagrantfile-windows_2008_r2.template b/vagrantfile-windows_2008_r2.template index 910d0bf9..126f44fc 100644 --- a/vagrantfile-windows_2008_r2.template +++ b/vagrantfile-windows_2008_r2.template @@ -16,7 +16,6 @@ Vagrant.configure("2") do |config| 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 diff --git a/vagrantfile-windows_2012.template b/vagrantfile-windows_2012.template index 842351c9..e5e5bd2c 100644 --- a/vagrantfile-windows_2012.template +++ b/vagrantfile-windows_2012.template @@ -16,7 +16,6 @@ Vagrant.configure("2") do |config| 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 diff --git a/vagrantfile-windows_2012_r2.template b/vagrantfile-windows_2012_r2.template index 0781adce..baec7c54 100644 --- a/vagrantfile-windows_2012_r2.template +++ b/vagrantfile-windows_2012_r2.template @@ -16,7 +16,6 @@ Vagrant.configure("2") do |config| 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 diff --git a/vagrantfile-windows_7.template b/vagrantfile-windows_7.template index 3d73475a..ea6ac765 100644 --- a/vagrantfile-windows_7.template +++ b/vagrantfile-windows_7.template @@ -16,7 +16,6 @@ Vagrant.configure("2") do |config| 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 diff --git a/vagrantfile-windows_81.template b/vagrantfile-windows_81.template index 2043f079..7257ead8 100644 --- a/vagrantfile-windows_81.template +++ b/vagrantfile-windows_81.template @@ -16,7 +16,6 @@ Vagrant.configure("2") do |config| 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 From e01868ae8bfdd3a0dcb35a828dd2826cd7e25e7b Mon Sep 17 00:00:00 2001 From: "Ireton, Doug" Date: Thu, 15 May 2014 20:11:22 -0700 Subject: [PATCH 5/7] Update chef-client source to getchef.com --- scripts/chef.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/chef.bat b/scripts/chef.bat index 90b0ccb3..a96cb2be 100644 --- a/scripts/chef.bat +++ b/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')" Date: Fri, 16 May 2014 22:37:36 -0600 Subject: [PATCH 6/7] Re-Add RDP Forward, Per @StefanScherer --- vagrantfile-windows_2008_r2.template | 7 ++++--- vagrantfile-windows_2012.template | 4 ++-- vagrantfile-windows_2012_r2.template | 4 ++-- vagrantfile-windows_7.template | 4 ++-- vagrantfile-windows_81.template | 4 ++-- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/vagrantfile-windows_2008_r2.template b/vagrantfile-windows_2008_r2.template index 126f44fc..2a8c30f0 100644 --- a/vagrantfile-windows_2008_r2.template +++ b/vagrantfile-windows_2008_r2.template @@ -1,7 +1,7 @@ # -*- mode: ruby -*- # vi: set ft=ruby : -Vagrant.require_version ">= 1.6.0" +Vagrant.require_version ">= 1.6.2" Vagrant.configure("2") do |config| config.vm.define "vagrant-windows-2008-r2" @@ -15,7 +15,8 @@ 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 @@ -43,4 +44,4 @@ Vagrant.configure("2") do |config| v.vmx["RemoteDisplay.vnc.port"] = "5900" v.vmx["scsi0.virtualDev"] = "lsisas1068" end -end \ No newline at end of file +end diff --git a/vagrantfile-windows_2012.template b/vagrantfile-windows_2012.template index e5e5bd2c..69256bff 100644 --- a/vagrantfile-windows_2012.template +++ b/vagrantfile-windows_2012.template @@ -1,7 +1,7 @@ # -*- mode: ruby -*- # vi: set ft=ruby : -Vagrant.require_version ">= 1.6.0" +Vagrant.require_version ">= 1.6.2" Vagrant.configure("2") do |config| config.vm.define "vagrant-windows-2012" @@ -15,7 +15,7 @@ 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 diff --git a/vagrantfile-windows_2012_r2.template b/vagrantfile-windows_2012_r2.template index baec7c54..7dbe7545 100644 --- a/vagrantfile-windows_2012_r2.template +++ b/vagrantfile-windows_2012_r2.template @@ -1,7 +1,7 @@ # -*- mode: ruby -*- # vi: set ft=ruby : -Vagrant.require_version ">= 1.6.0" +Vagrant.require_version ">= 1.6.2" Vagrant.configure("2") do |config| config.vm.define "vagrant-windows-2012-r2" @@ -15,7 +15,7 @@ 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 diff --git a/vagrantfile-windows_7.template b/vagrantfile-windows_7.template index ea6ac765..693ba548 100644 --- a/vagrantfile-windows_7.template +++ b/vagrantfile-windows_7.template @@ -1,7 +1,7 @@ # -*- mode: ruby -*- # vi: set ft=ruby : -Vagrant.require_version ">= 1.6.0" +Vagrant.require_version ">= 1.6.2" Vagrant.configure("2") do |config| config.vm.define "vagrant-windows-7" @@ -15,7 +15,7 @@ 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 diff --git a/vagrantfile-windows_81.template b/vagrantfile-windows_81.template index 7257ead8..f4bf80cf 100644 --- a/vagrantfile-windows_81.template +++ b/vagrantfile-windows_81.template @@ -1,7 +1,7 @@ # -*- mode: ruby -*- # vi: set ft=ruby : -Vagrant.require_version ">= 1.6.0" +Vagrant.require_version ">= 1.6.2" Vagrant.configure("2") do |config| config.vm.define "vagrant-windows-81" @@ -15,7 +15,7 @@ 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 From 82ccaf3e3a38231264a59899f5362c8de125b910 Mon Sep 17 00:00:00 2001 From: Joe Fitzgerald Date: Fri, 16 May 2014 22:40:23 -0600 Subject: [PATCH 7/7] Update CHANGELOG --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 764c7c8c..e97c4976 100644 --- a/CHANGELOG.md +++ b/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