Commit includes:

[netvirt.git] / Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index 54d7eacfb11551304ba0fbaba786370dac39a62f..7d43bcb0e31d292591a22c3ec5124d9aeb4662cf 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,6 +3,12 @@ VAGRANTFILE_API_VERSION = "2"
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
+  config.vm.box = "trusty64"
+  config.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box"
+  config.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"
+  end
+
   config.vm.provision "shell", path: "resources/puppet/scripts/bootstrap.sh"
 
   config.vm.provision "puppet" do |puppet|
@@ -19,37 +25,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   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.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.04_chef-provisionerless.box"
-    end
-    mininet.vm.hostname = "mininet"
-    mininet.vm.network "private_network", ip: "192.168.50.15"
-    mininet.vm.provider :virtualbox do |vb|
-      vb.memory = 2048
-    end
-    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"
-      puppet.manifests_path = "resources/puppet/manifests"
-      puppet.manifest_file  = "mininet.pp"
-    end
-  end
-
   config.vm.define "devstack-control" do |control|
-    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"
-    end
     control.vm.hostname = "devstack-control"
     control.vm.network "private_network", ip: "#{control_ip}"
     control.vm.network "forwarded_port", guest: 8080, host: 8081
@@ -75,11 +51,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     config.vm.define "devstack-compute-#{n+1}" do |compute|
       compute_ip = compute_ips[n]
       compute_index = n+1
-      compute.vm.box = "trusty64"
-      compute.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-14.04_chef-provisionerless.box"
-      compute.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"
-      end
       compute.vm.hostname = "devstack-compute-#{compute_index}"
       compute.vm.network "private_network", ip: "#{compute_ip}"
       compute.vm.provider :virtualbox do |vb|