Merge "Bug 1799: Fixed broken Vagrantfile URL"

diff --cc Vagrantfile
index 84180669b6b5bc8d64abe3fc18f5e1870a1051c6,e624d6e1250133a8c5e7a29a775ed9ee9082d5d6..81a3d7384df1127d93beb44bcf5e92bdbdeeff4f
--- 1/Vagrantfile
--- 2/Vagrantfile
+++ b/Vagrantfile
@@@ -12,18 -12,11 +12,18 @@@ Vagrant.configure(VAGRANTFILE_API_VERSI
        puppet.manifest_file  = "base.pp"
    end
  
 +  num_compute_nodes = (ENV['DEVSTACK_NUM_COMPUTE_NODES'] || 1).to_i
 +
 +  # ip configuration
 +  control_ip = "192.168.50.20"
 +  compute_ip_base = "192.168.50."
 +  compute_ips = num_compute_nodes.times.collect { |n| compute_ip_base + "#{n+21}" }
 +
    config.vm.define "mininet" do |mininet|
      mininet.vm.box = "trusty64"
-     mininet.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.10_chef-provisionerless.box"
+     mininet.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box"
      mininet.vm.provider "vmware_fusion" do |v, override|
-       override.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.10_chef-provisionerless.box"
+       override.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.04_chef-provisionerless.box"
      end
      mininet.vm.hostname = "mininet"
      mininet.vm.network "private_network", ip: "192.168.50.15"