From 01bb8d568c2cc8da01283017958f15ed62bd9dce Mon Sep 17 00:00:00 2001 From: Micah R Ledbetter Date: Tue, 22 Nov 2016 17:12:48 -0600 Subject: [PATCH] Use Vagrant catalog in Freyja VMs, other minor improvements --- .../wintriallab-win10-32_vagrantfile.template | 13 +++------- vagrant/FreyjaA/Vagrantfile | 25 ++++++------------- vagrant/FreyjaB/Vagrantfile | 25 ++++++------------- vagrant/FreyjaC/Vagrantfile | 25 ++++++------------- 4 files changed, 28 insertions(+), 60 deletions(-) diff --git a/packer/wintriallab-win10-32/wintriallab-win10-32_vagrantfile.template b/packer/wintriallab-win10-32/wintriallab-win10-32_vagrantfile.template index f102c3d..d645698 100644 --- a/packer/wintriallab-win10-32/wintriallab-win10-32_vagrantfile.template +++ b/packer/wintriallab-win10-32/wintriallab-win10-32_vagrantfile.template @@ -1,21 +1,16 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - Vagrant.require_version ">= 1.6.2" Vagrant.configure("2") do |config| - config.vm.define "vagrant-windows-10" - config.vm.box = "windows_10_x86_virtualbox.box" + config.vm.define "vagrant_wintriallab-win10-32_template" + config.vm.box = "wintriallab-win10-32" + config.vm.box_url = "file:///E:/Micah/caryatid/wintriallab-win10-32.json" config.vm.communicator = "winrm" - - # Admin user name and password config.winrm.username = "vagrant" config.winrm.password = "V@grant123" - config.vm.guest = :windows config.windows.halt_timeout = 15 - config.vm.network :forwarded_port, guest: 3389, host: 3389, id: "rdp", auto_correct: true + config.vm.network :forwarded_port, guest: 3389, host: 3390, id: "rdp", auto_correct: true config.vm.provider :virtualbox do |v, override| #v.gui = true diff --git a/vagrant/FreyjaA/Vagrantfile b/vagrant/FreyjaA/Vagrantfile index 820b105..6c13577 100644 --- a/vagrant/FreyjaA/Vagrantfile +++ b/vagrant/FreyjaA/Vagrantfile @@ -1,6 +1,3 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - require "date" Vagrant.require_version ">= 1.6.2" @@ -12,14 +9,12 @@ thisVagrantfileDir = File.dirname(__FILE__) commonScriptsDir = "#{thisVagrantfileDir}/../../scripts" Vagrant.configure("2") do |config| - config.vm.define "FreyjaA-2016-11-02" - config.vm.box = "wintriallab-windows_10_x86" + config.vm.define "FreyjaA-2016-11-22" + config.vm.box = "wintriallab-win10-32" + config.vm.box_url = "file:///E:/Micah/caryatid/wintriallab-win10-32.json" config.vm.communicator = "winrm" - - # Admin user name and password config.winrm.username = "vagrant" config.winrm.password = "V@grant123" - config.vm.guest = :windows config.windows.halt_timeout = 15 @@ -30,6 +25,8 @@ Vagrant.configure("2") do |config| #config.vm.network :public_network #config.vm.network :public_network, :adapter=>1, type:"dhcp", :bridge=>'Ethernet' + config.vm.network :forwarded_port, guest: 3389, host: 3301, id: "rdp", auto_correct: true + config.vm.provider :virtualbox do |v, override| #v.gui = true v.customize ["modifyvm", :id, "--memory", 3072] @@ -41,16 +38,10 @@ Vagrant.configure("2") do |config| v.customize ["modifyvm", :id, "--draganddrop", "bidirectional"] end - begin - Dir.mkdir('./synced') - rescue - puts "./synced is already created I guess idk" - end - config.vm.synced_folder ".", "/vagrant", disabled: true - config.vm.synced_folder "./synced", "/vagrant", create: true config.vm.synced_folder "#{ENV['USERPROFILE']}\\Documents\\VMShare", "/VMShare", create: true - FileUtils.cp "#{commonScriptsDir}/wintriallab-postinstall.psm1", "./synced/wintriallab-postinstall.psm1" - FileUtils.cp "#{commonScriptsDir}/freyja-provisioner.ps1", "./synced/freyja-provisioner.ps1" + + FileUtils.cp "#{commonScriptsDir}/wintriallab-postinstall.psm1", "./wintriallab-postinstall.psm1" + FileUtils.cp "#{commonScriptsDir}/freyja-provisioner.ps1", "./freyja-provisioner.ps1" config.vm.provision "shell", inline: "C:/vagrant/freyja-provisioner.ps1" end diff --git a/vagrant/FreyjaB/Vagrantfile b/vagrant/FreyjaB/Vagrantfile index 8e068ac..b4cff93 100644 --- a/vagrant/FreyjaB/Vagrantfile +++ b/vagrant/FreyjaB/Vagrantfile @@ -1,6 +1,3 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - require "date" Vagrant.require_version ">= 1.6.2" @@ -12,14 +9,12 @@ thisVagrantfileDir = File.dirname(__FILE__) commonScriptsDir = "#{thisVagrantfileDir}/../../scripts" Vagrant.configure("2") do |config| - config.vm.define "FreyjaB-2016-11-02" - config.vm.box = "wintriallab-windows_10_x86" + config.vm.define "FreyjaB-2016-11-22" + config.vm.box = "wintriallab-win10-32" + config.vm.box_url = "file:///E:/Micah/caryatid/wintriallab-win10-32.json" config.vm.communicator = "winrm" - - # Admin user name and password config.winrm.username = "vagrant" config.winrm.password = "V@grant123" - config.vm.guest = :windows config.windows.halt_timeout = 15 @@ -30,6 +25,8 @@ Vagrant.configure("2") do |config| #config.vm.network :public_network #config.vm.network :public_network, :adapter=>1, type:"dhcp", :bridge=>'Ethernet' + config.vm.network :forwarded_port, guest: 3389, host: 3302, id: "rdp", auto_correct: true + config.vm.provider :virtualbox do |v, override| #v.gui = true v.customize ["modifyvm", :id, "--memory", 3072] @@ -41,16 +38,10 @@ Vagrant.configure("2") do |config| v.customize ["modifyvm", :id, "--draganddrop", "bidirectional"] end - begin - Dir.mkdir('./synced') - rescue - puts "./synced is already created I guess idk" - end - config.vm.synced_folder ".", "/vagrant", disabled: true - config.vm.synced_folder "./synced", "/vagrant", create: true config.vm.synced_folder "#{ENV['USERPROFILE']}\\Documents\\VMShare", "/VMShare", create: true - FileUtils.cp "#{commonScriptsDir}/wintriallab-postinstall.psm1", "./synced/wintriallab-postinstall.psm1" - FileUtils.cp "#{commonScriptsDir}/freyja-provisioner.ps1", "./synced/freyja-provisioner.ps1" + + FileUtils.cp "#{commonScriptsDir}/wintriallab-postinstall.psm1", "./wintriallab-postinstall.psm1" + FileUtils.cp "#{commonScriptsDir}/freyja-provisioner.ps1", "./freyja-provisioner.ps1" config.vm.provision "shell", inline: "C:/vagrant/freyja-provisioner.ps1" end diff --git a/vagrant/FreyjaC/Vagrantfile b/vagrant/FreyjaC/Vagrantfile index e948efc..2161873 100644 --- a/vagrant/FreyjaC/Vagrantfile +++ b/vagrant/FreyjaC/Vagrantfile @@ -1,6 +1,3 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : - require "date" Vagrant.require_version ">= 1.6.2" @@ -12,14 +9,12 @@ thisVagrantfileDir = File.dirname(__FILE__) commonScriptsDir = "#{thisVagrantfileDir}/../../scripts" Vagrant.configure("2") do |config| - config.vm.define "FreyjaC-2016-11-02" - config.vm.box = "wintriallab-windows_10_x86" + config.vm.define "FreyjaC-2016-11-22" + config.vm.box = "wintriallab-win10-32" + config.vm.box_url = "file:///E:/Micah/caryatid/wintriallab-win10-32.json" config.vm.communicator = "winrm" - - # Admin user name and password config.winrm.username = "vagrant" config.winrm.password = "V@grant123" - config.vm.guest = :windows config.windows.halt_timeout = 15 @@ -30,6 +25,8 @@ Vagrant.configure("2") do |config| #config.vm.network :public_network #config.vm.network :public_network, :adapter=>1, type:"dhcp", :bridge=>'Ethernet' + config.vm.network :forwarded_port, guest: 3389, host: 3303, id: "rdp", auto_correct: true + config.vm.provider :virtualbox do |v, override| #v.gui = true v.customize ["modifyvm", :id, "--memory", 3072] @@ -41,16 +38,10 @@ Vagrant.configure("2") do |config| v.customize ["modifyvm", :id, "--draganddrop", "bidirectional"] end - begin - Dir.mkdir('./synced') - rescue - puts "./synced is already created I guess idk" - end - config.vm.synced_folder ".", "/vagrant", disabled: true - config.vm.synced_folder "./synced", "/vagrant", create: true config.vm.synced_folder "#{ENV['USERPROFILE']}\\Documents\\VMShare", "/VMShare", create: true - FileUtils.cp "#{commonScriptsDir}/wintriallab-postinstall.psm1", "./synced/wintriallab-postinstall.psm1" - FileUtils.cp "#{commonScriptsDir}/freyja-provisioner.ps1", "./synced/freyja-provisioner.ps1" + + FileUtils.cp "#{commonScriptsDir}/wintriallab-postinstall.psm1", "./wintriallab-postinstall.psm1" + FileUtils.cp "#{commonScriptsDir}/freyja-provisioner.ps1", "./freyja-provisioner.ps1" config.vm.provision "shell", inline: "C:/vagrant/freyja-provisioner.ps1" end