Inherit groupId/version from parent

[ovsdb.git] / Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index 84180669b6b5bc8d64abe3fc18f5e1870a1051c6..54d7eacfb11551304ba0fbaba786370dac39a62f 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -21,9 +21,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   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"
@@ -33,6 +33,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     mininet.vm.provider "vmware_fusion" do |vf|
       vf.vmx["memsize"] = "2048"
     end
+    mininet.vm.provider :libvirt do |lv|
+      lv.memory = 2048
+    end
     mininet.vm.provision "puppet" do |puppet|
       puppet.hiera_config_path = "resources/puppet/hiera.yaml"
       puppet.working_directory = "/vagrant/resources/puppet"
@@ -42,7 +45,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   end
 
   config.vm.define "devstack-control" do |control|
-    control.vm.box = "saucy64"
+    control.vm.box = "trusty64"
     control.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box"
     control.vm.provider "vmware_fusion" do |v, override|
       override.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-14.04_chef-provisionerless.box"
@@ -56,6 +59,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     control.vm.provider "vmware_fusion" do |vf|
       vf.vmx["memsize"] = "4096"
     end
+    control.vm.provider :libvirt do |lv|
+      lv.memory = 4096
+    end
     control.vm.provision "puppet" do |puppet|
       puppet.hiera_config_path = "resources/puppet/hiera.yaml"
       puppet.working_directory = "/vagrant/resources/puppet"
@@ -82,6 +88,9 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       compute.vm.provider "vmware_fusion" do |vf|
         vf.vmx["memsize"] = "4096"
       end
+      compute.vm.provider :libvirt do |lv|
+        lv.memory = 4096
+      end
       compute.vm.provision "puppet" do |puppet|
         puppet.hiera_config_path = "resources/puppet/hiera.yaml"
         puppet.working_directory = "/vagrant/resources/puppet"