commit d8d8231ef2de62cd2a2af486af4ad5b216fa51e1
author Luca Prete <luca@onlab.us> Thu Mar 23 10:26:16 2017 -0700
committer Luca Prete <luca@onlab.us> Mon Apr 24 23:58:15 2017 +0000
tree de9279fc6c34500251a964f76bf10ee5c99d1530
parent 84c5a3d8adef517423d03e024e60eae4ef33e2ad

Updating and fixing vagrant ONOS VM

Change-Id: I75313d7e254aa08d8567ae5701c219677f279991
(cherry picked from commit 5f8893092a82dded627806b086fef68e1c3fb394)

tools/dev/vagrant/Vagrantfile

diff --git a/tools/dev/vagrant/Vagrantfile b/tools/dev/vagrant/Vagrantfile
index e694f75..7148376 100644
--- a/tools/dev/vagrant/Vagrantfile
+++ b/tools/dev/vagrant/Vagrantfile
@@ -13,6 +13,9 @@
     v.customize ["modifyvm", :id, "--vram", "32"]
   end
 
+  # Creates an ONOS tutorial VM.
+  # It contains Mininet, three LXC containers used as ONOS target machines, the tutorial files.
+  # The machine comes also with the Ubuntu GUI to support tutorials.
   config.vm.define "onostutorial" do |d|
     d.vm.box = "ubuntu/xenial64"
     d.vm.hostname = "onostutorial"
@@ -33,9 +36,12 @@
     end
   end
 
-  config.vm.define "onosdev" do |d|
+  # Creates a VM with three LXC containers inside.
+  # Miniet is installed on the virtual machine itself.
+  # The three LXC containers serve as ONOS target machines.
+  config.vm.define "onosdevmn" do |d|
     d.vm.box = "ubuntu/xenial64"
-    d.vm.hostname = "onosdev"
+    d.vm.hostname = "onosmn"
     d.vm.network "private_network", ip: "10.100.198.200"
     d.vm.provision :shell, path: "scripts/bootstrap_ansible.sh"
     d.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /vagrant/ansible/basic.yml -c local"
@@ -48,6 +54,22 @@
     end
   end
 
+  # Creates a VM with three LXC containers inside, to be used as ONOS target machines.
+  config.vm.define "onosdev" do |d|
+    d.vm.box = "ubuntu/xenial64"
+    d.vm.hostname = "onosdev"
+    d.vm.network "private_network", ip: "10.100.198.200"
+    d.vm.provision :shell, path: "scripts/bootstrap_ansible.sh"
+    d.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /vagrant/ansible/basic.yml -c local"
+    d.vm.provision :shell, inline: "PYTHONUNBUFFERED=1 ansible-playbook /vagrant/ansible/mn.yml -c local"
+    d.vm.provider "virtualbox" do |v|
+      v.customize ["modifyvm", :id, "--nicpromisc2", "allow-all"]
+      v.memory = 4096
+      v.cpus = 2
+    end
+  end
+
+  # Creates a VM and installs Mininet in it.
   config.vm.define "mn" do |d|
     d.vm.box = "ubuntu/xenial64"
     d.vm.hostname = "mn"