Commit cfbe077a authored by Joe Fitzgerald's avatar Joe Fitzgerald

Require The vagrant-windows Plugin In Vagrantfile Templates

- Remove commented out code in Vagrantfile templates
- Ensure headless = true is set by default on Windows 8.1 template
parent f724e75a
## v1.9 (Planned)
## v1.10 (Planned)
*
## v1.9 (March 14th, 2014)
* Add support for Windows 8.1
* Add port forwarding for WinRM (5985) by default, with vagrant auto-correct enabled
* Require the use of the vagrant-windows plugin in the Vagrantfile templates
## v1.8 (March 7th, 2014)
* Updated oracle.cer to allow installation of VirtualBox tools
......
......@@ -4,23 +4,23 @@
Vagrant.configure("2") do |config|
config.vm.define "vagrant-windows-2008-r2"
config.vm.box = "windows_2008_r2"
# You should be using the vagrant-windows Vagrant Plugin!
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"
config.vm.guest = :windows
config.vm.guest = :windows
config.windows.halt_timeout = 15
config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true
# Berkshelf
# config.berkshelf.enabled = true
# Shell - Hello World
# config.vm.provision :shell, :inline => "C:\\vagrant\\scripts\\HelloWorld.bat"
config.vm.provider :virtualbox do |v, override|
#v.gui = true
v.customize ["modifyvm", :id, "--memory", 2048]
......@@ -44,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
......@@ -4,29 +4,29 @@
Vagrant.configure("2") do |config|
config.vm.define "vagrant-windows-2012"
config.vm.box = "windows_2012"
# You should be using the vagrant-windows Vagrant Plugin!
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"
config.vm.guest = :windows
config.vm.guest = :windows
config.windows.halt_timeout = 15
# Berkshelf
# config.berkshelf.enabled = true
config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true
# Shell - Hello World
# config.vm.provision :shell, :inline => "C:\\vagrant\\scripts\\HelloWorld.bat"
config.vm.provider :virtualbox do |v, override|
#v.gui = true
v.customize ["modifyvm", :id, "--memory", 2048]
v.customize ["modifyvm", :id, "--cpus", 2]
v.customize ["modifyvm", :id, "--cpus", 2]
end
config.vm.provider :vmware_fusion do |v, override|
#v.gui = true
v.vmx["memsize"] = "2048"
......@@ -35,7 +35,7 @@ Vagrant.configure("2") do |config|
v.vmx["RemoteDisplay.vnc.port"] = "5900"
v.vmx["scsi0.virtualDev"] = "lsisas1068"
end
config.vm.provider :vmware_workstation do |v, override|
#v.gui = true
v.vmx["memsize"] = "2048"
......
......@@ -5,28 +5,28 @@ Vagrant.configure("2") do |config|
config.vm.define "vagrant-windows-2012-r2"
config.vm.box = "windows_2012_r2"
# You should be using the vagrant-windows Vagrant Plugin!
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"
config.vm.guest = :windows
config.vm.guest = :windows
config.windows.halt_timeout = 15
# Berkshelf
# config.berkshelf.enabled = true
config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true
# Shell - Hello World
# config.vm.provision :shell, :inline => "C:\\vagrant\\scripts\\HelloWorld.bat"
config.vm.provider :virtualbox do |v, override|
#v.gui = true
v.customize ["modifyvm", :id, "--memory", 2048]
v.customize ["modifyvm", :id, "--cpus", 2]
v.customize ["modifyvm", :id, "--cpus", 2]
end
config.vm.provider :vmware_fusion do |v, override|
#v.gui = true
v.vmx["memsize"] = "2048"
......@@ -35,7 +35,7 @@ Vagrant.configure("2") do |config|
v.vmx["RemoteDisplay.vnc.port"] = "5900"
v.vmx["scsi0.virtualDev"] = "lsisas1068"
end
config.vm.provider :vmware_workstation do |v, override|
#v.gui = true
v.vmx["memsize"] = "2048"
......@@ -44,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
......@@ -5,28 +5,28 @@ Vagrant.configure("2") do |config|
config.vm.define "vagrant-windows-7"
config.vm.box = "windows_7"
# You should be using the vagrant-windows Vagrant Plugin!
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"
config.vm.guest = :windows
config.vm.guest = :windows
config.windows.halt_timeout = 15
# Berkshelf
# config.berkshelf.enabled = true
config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true
# Shell - Hello World
# config.vm.provision :shell, :inline => "C:\\vagrant\\scripts\\HelloWorld.bat"
config.vm.provider :virtualbox do |v, override|
#v.gui = true
v.customize ["modifyvm", :id, "--memory", 2048]
v.customize ["modifyvm", :id, "--cpus", 2]
v.customize ["modifyvm", :id, "--cpus", 2]
end
config.vm.provider :vmware_fusion do |v, override|
#v.gui = true
v.vmx["memsize"] = "2048"
......@@ -35,7 +35,7 @@ Vagrant.configure("2") do |config|
v.vmx["RemoteDisplay.vnc.port"] = "5900"
v.vmx["scsi0.virtualDev"] = "lsisas1068"
end
config.vm.provider :vmware_workstation do |v, override|
#v.gui = true
v.vmx["memsize"] = "2048"
......
......@@ -5,28 +5,28 @@ Vagrant.configure("2") do |config|
config.vm.define "vagrant-windows-81"
config.vm.box = "windows_81"
# You should be using the vagrant-windows Vagrant Plugin!
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"
config.vm.guest = :windows
config.vm.guest = :windows
config.windows.halt_timeout = 15
config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true
# Berkshelf
# config.berkshelf.enabled = true
# Shell - Hello World
# config.vm.provision :shell, :inline => "C:\\vagrant\\scripts\\HelloWorld.bat"
config.vm.provider :virtualbox do |v, override|
#v.gui = true
v.customize ["modifyvm", :id, "--memory", 2048]
v.customize ["modifyvm", :id, "--cpus", 2]
v.customize ["modifyvm", :id, "--cpus", 2]
end
config.vm.provider :vmware_fusion do |v, override|
#v.gui = true
v.vmx["memsize"] = "2048"
......@@ -35,7 +35,7 @@ Vagrant.configure("2") do |config|
v.vmx["RemoteDisplay.vnc.port"] = "5900"
v.vmx["scsi0.virtualDev"] = "lsisas1068"
end
config.vm.provider :vmware_workstation do |v, override|
#v.gui = true
v.vmx["memsize"] = "2048"
......
......@@ -28,13 +28,13 @@
"numvcpus": "2",
"scsi0.virtualDev": "lsisas1068"
}
},
},
{
"type": "virtualbox-iso",
"iso_url": "http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.16384.WINBLUE_RTM.130821-1623_X64FRE_ENTERPRISE_EVAL_EN-US-IRM_CENA_X64FREE_EN-US_DV5.ISO",
"iso_checksum_type": "md5",
"iso_checksum": "5e4ecb86fd8619641f1d58f96e8561ec",
"headless": false,
"headless": true,
"boot_wait": "2m",
"ssh_username": "vagrant",
"ssh_password": "vagrant",
......@@ -64,7 +64,7 @@
"./scripts/chef.bat",
"./scripts/vagrant-ssh.bat"
]
},
},
{
"type": "shell", "inline": ["rm -rf /tmp/*"]
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment