Merge "Enable NetVirt Maven site"

[netvirt.git] / Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index a49014500462493163d003a489d00db5740089b1..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|
@@ -12,44 +18,27 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       puppet.manifest_file  = "base.pp"
   end
 
-  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.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"
-    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.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
+  num_compute_nodes = (ENV['DEVSTACK_NUM_COMPUTE_NODES'] || 1).to_i
 
-  config.vm.define "devstack-control" do |dsctl|
-    dsctl.vm.box = "saucy64"
-    dsctl.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10_chef-provisionerless.box"
-    dsctl.vm.provider "vmware_fusion" do |v, override|
-      override.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.10_chef-provisionerless.box"
-    end
-    dsctl.vm.hostname = "devstack-control"
-    dsctl.vm.network "private_network", ip: "192.168.50.20"
-    dsctl.vm.network "forwarded_port", guest: 8080, host: 8081
-    dsctl.vm.provider :virtualbox do |vb|
+  # 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 "devstack-control" do |control|
+    control.vm.hostname = "devstack-control"
+    control.vm.network "private_network", ip: "#{control_ip}"
+    control.vm.network "forwarded_port", guest: 8080, host: 8081
+    control.vm.provider :virtualbox do |vb|
       vb.memory = 4096
     end
-    dsctl.vm.provider "vmware_fusion" do |vf|
+    control.vm.provider "vmware_fusion" do |vf|
       vf.vmx["memsize"] = "4096"
     end
-    dsctl.vm.provision "puppet" do |puppet|
+    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"
       puppet.manifests_path = "resources/puppet/manifests"
@@ -57,26 +46,28 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
   end
 
-  config.vm.define "devstack-compute" do |dscom|
-    dscom.vm.box = "saucy64"
-    dscom.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/virtualbox/opscode_ubuntu-13.10_chef-provisionerless.box"
-    dscom.vm.provider "vmware_fusion" do |v, override|
-      override.vm.box_url = "http://opscode-vm-bento.s3.amazonaws.com/vagrant/vmware/opscode_ubuntu-13.10_chef-provisionerless.box"
-    end
-    dscom.vm.hostname = "devstack-compute"
-    dscom.vm.network "private_network", ip: "192.168.50.21"
-    dscom.vm.provider :virtualbox do |vb|
-      vb.memory = 4096
-    end
-    dscom.vm.provider "vmware_fusion" do |vf|
-      vf.vmx["memsize"] = "4096"
-    end
-    dscom.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  = "devstack-compute.pp"
+  # Devstack Compute Nodes
+  num_compute_nodes.times do |n|
+    config.vm.define "devstack-compute-#{n+1}" do |compute|
+      compute_ip = compute_ips[n]
+      compute_index = n+1
+      compute.vm.hostname = "devstack-compute-#{compute_index}"
+      compute.vm.network "private_network", ip: "#{compute_ip}"
+      compute.vm.provider :virtualbox do |vb|
+        vb.memory = 4096
+      end
+      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"
+        puppet.manifests_path = "resources/puppet/manifests"
+        puppet.manifest_file  = "devstack-compute.pp"
+      end
     end
   end
-
 end