Merge pull request #582 from opdemand/change-vagrantfile-template-url

change box_url to be the same as controller

Author: mboersma

contrib/vagrant/Vagrantfile

@@ -1,8 +1,8 @@
 Vagrant.configure("2") do |config|
-  config.vm.box = "deis-controller"
+  config.vm.box = "deis-server"
 
   # Ubuntu 12.04.3 LTS base with 3.8 kernel (ready for Docker)
-  config.vm.box_url = "https://oss-binaries.phusionpassenger.com/vagrant/boxes/ubuntu-12.04.3-amd64-vbox.box"
+  config.vm.box_url = "https://s3-us-west-2.amazonaws.com/opdemand/ubuntu-12.04.3-amd64-vbox.box"
 
   # Avahi-daemon will broadcast the server's address as deis-controller.local
   config.vm.host_name = "deis-controller"

contrib/vagrant/util/nodes_vagrantfile_template.rb

@@ -1,9 +1,9 @@
 Vagrant.configure("2") do |config|
-  config.vm.box = "deis-node"
+  config.vm.box = "deis-server"
 
   # The url from where the 'config.vm.box' box will be fetched if it
   # doesn't already exist on the user's system.
-  config.vm.box_url = "https://s3-us-west-2.amazonaws.com/opdemand/deis-node.box"
+  config.vm.box_url = "https://s3-us-west-2.amazonaws.com/opdemand/ubuntu-12.04.3-amd64-vbox.box"
 
   # Avahi-daemon will broadcast the node's address as $id.local
   config.vm.host_name = "$id"
@@ -22,4 +22,4 @@
     sudo service avahi-daemon restart
     echo "*.* @@192.168.61.100:514" > /etc/rsyslog.d/51-remote.conf
   SCRIPT
-end
+end