Reverting some changes so that Virtualbox works again

1 files changed, 17 insertions, 24 deletions

diff --git a/Vagrantfile b/Vagrantfile
index f251dca..01bd80b 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -34,7 +34,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.provider "virtualbox" do |v|
     v.memory = 1024
-    v.vm.box = "ubuntu/trusty64"
   end
 
   # VM for commercial databases (Oracle and SQL Server) running on a commercial OS (Windows 2008 Server)
@@ -49,22 +48,21 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     windows.winrm.username = "Administrator"
     windows.winrm.password = "vagrant"
 
-    windows.vm.provider "virtualbox" do |vb|
-      vb.provision :shell, :path => "vagrant_scripts/windows_bootstrap.ps1"
+    # Provide the path to your virtualbox image which is running SQL Server 2014 and/or Oracle 11G XE:
+    windows.vm.box = "/Volumes/Virtual Disk Storage/jakefeasel.windows2008R2SQLServer2014Oracle11GXE_prepped.box"
 
-      vb.network "private_network", ip: "10.0.0.16"
-      vb.network :forwarded_port, guest: 3389, host: 3389
-      vb.base_mac = "0800275A6A2B"
+    # commented out but left here to demonstrate what needs to be executed on this server to prep the DBs
+    # windows.vm.provision :shell, :path => "vagrant_scripts/windows_bootstrap.ps1"
 
-      # Provide the path to your virtualbox image which is running SQL Server 2014 and/or Oracle 11G XE:
-      vb.box = "/Volumes/Virtual Disk Storage/jakefeasel.windows2008R2SQLServer2014Oracle11GXE.box"
-    end
+    windows.vm.network "private_network", ip: "10.0.0.16"
+    windows.vm.network :forwarded_port, guest: 3389, host: 3389
+    windows.vm.base_mac = "0800275A6A2B"
 
     # rsync to windows on aws doesn't seem to work, so don't bother (do the necessary provisioning before creating the ami)
     windows.vm.synced_folder ".", "/vagrant", disabled: true
 
-
     windows.vm.provider "aws" do |aws|
+
       aws.private_ip_address = "10.0.0.17"
       # is it expected that the ami has already executed the code in vagrant_scripts/windows_bootstrap.ps1
       aws.ami = "ami-892d0db9" # Windows Server 2008 w/ MS SQL 2014 Express and Oracle 11g XE (private)
@@ -74,10 +72,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.define "postgresql93" do |postgresql93|
     postgresql93.vm.provision :shell, :path => "vagrant_scripts/pg93_bootstrap.sh"
-
-    postgresql93.vm.provider "virtualbox" do |vb|
-      vb.network "private_network", ip: "10.0.0.16"
-    end
+    postgresql93.vm.box = "ubuntu/trusty64"
+    postgresql93.vm.network "private_network", ip: "10.0.0.16"
 
     postgresql93.vm.provider "aws" do |aws|
       aws.private_ip_address = "10.0.0.16"
@@ -86,10 +82,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.define "mysql56" do |mysql56|
     mysql56.vm.provision :shell, :path => "vagrant_scripts/my56_bootstrap.sh"
-
-    mysql56.vm.provider "virtualbox" do |vb|
-      vb.network "private_network", ip: "10.0.0.15"
-    end
+    mysql56.vm.box = "ubuntu/trusty64"
+    mysql56.vm.network "private_network", ip: "10.0.0.15"
 
     mysql56.vm.provider "aws" do |aws|
       aws.private_ip_address = "10.0.0.15"
@@ -98,12 +92,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   config.vm.define "idm", primary: true do |idm|
 
-    idm.vm.provider "virtualbox" do |vb|
-      vb.network "private_network", ip: "10.0.0.14"
-      vb.network "forwarded_port", guest: 6081, host: 6081
-      vb.network "forwarded_port", guest: 8080, host: 18080
-      vb.network "forwarded_port", guest: 8443, host: 18443
-    end
+    idm.vm.box = "ubuntu/trusty64"
+    idm.vm.network "private_network", ip: "10.0.0.14"
+    idm.vm.network "forwarded_port", guest: 80, host: 6081
+    idm.vm.network "forwarded_port", guest: 8080, host: 18080
+    idm.vm.network "forwarded_port", guest: 8443, host: 18443
 
     idm.vm.provider "aws" do |aws|
       aws.private_ip_address = "10.0.0.14"