commit 03021716443451688e1a9de0cb03d8f0622f34bd
author Eric Newberry <enewberry@cs.arizona.edu> Thu Mar 29 00:56:17 2018 -0700
committer Eric Newberry <enewberry@cs.arizona.edu> Fri Mar 30 17:29:09 2018 -0700
tree 6e3a023fa3c9f5bcf8fd5f4c78b2a33539c73df1
parent fe0d014d49e2ea8d380ad7d8bbead28cf5db2cc1

change Vagrant platform to Ubuntu 16.04

refs #4559

Change-Id: Ie667f8402ae30cf379c2dc55d8139ea229cf48ed

Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index be9da5e..56bb131 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -29,31 +29,31 @@
 EOF
 
 sudo ip route add 192.168.3.0/24 via 192.168.2.3
-sudo ip -6 addr add fd01::3/64 dev eth1
-sudo ip -6 addr add fd02::2/64 dev eth2
+sudo ip -6 addr add fd01::3/64 dev enp0s8
+sudo ip -6 addr add fd02::2/64 dev enp0s9
 sudo ip -6 route add fd03::/64 via fd02::3
 SCRIPT
 
 $setup_d = <<SCRIPT
 ip route add 192.168.2.0/24 via 192.168.3.2
-ip -6 addr add fd03::3/64 dev eth1
+ip -6 addr add fd03::3/64 dev enp0s8
 ip -6 route add fd02::/64 via fd03::2
 SCRIPT
 
 $setup_router = <<SCRIPT
 echo 1 > /proc/sys/net/ipv4/ip_forward
 echo 1 > /proc/sys/net/ipv6/conf/all/forwarding
-ip -6 addr add fd02::3/64 dev eth1
-ip -6 addr add fd03::2/64 dev eth2
+ip -6 addr add fd02::3/64 dev enp0s8
+ip -6 addr add fd03::2/64 dev enp0s9
 SCRIPT
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
-  config.vm.box = "ubuntu/trusty64"
+  config.vm.box = "ndn-jenkins/ubuntu1604-amd64"
 
   config.vm.provider "virtualbox" do |vb|
     vb.memory = "512"
     vb.cpus = "1"
-    vb.customize ["storagectl", :id, "--name", "SATAController", "--hostiocache", "off"]
+    vb.customize ["storagectl", :id, "--name", "SATA Controller", "--hostiocache", "off"]
   end
 
   config.vm.define "template" do |t|
@@ -78,14 +78,14 @@
     b.vm.box = "nfd-integ"
     b.vm.network "private_network", ip: "192.168.1.2", virtualbox__intnet: "ABC-switch"
     b.vm.provision "shell", inline: $setup, privileged: false
-    b.vm.provision "shell", inline: "ip -6 addr add fd01::2/64 dev eth1"
+    b.vm.provision "shell", inline: "ip -6 addr add fd01::2/64 dev enp0s8"
   end
 
   config.vm.define "C" do |c|
     c.vm.box = "nfd-integ"
     c.vm.network "private_network", ip: "192.168.1.4", virtualbox__intnet: "ABC-switch"
     c.vm.provision "shell", inline: $setup, privileged: false
-    c.vm.provision "shell", inline: "ip -6 addr add fd01::4/64 dev eth1"
+    c.vm.provision "shell", inline: "ip -6 addr add fd01::4/64 dev enp0s8"
   end
 
   config.vm.define "D" do |d|
@@ -100,7 +100,7 @@
     router.vm.network "private_network", ip: "192.168.3.2", virtualbox__intnet: "DtoRouter"
     router.vm.provision "shell", inline: $setup_router
     router.vm.provider "virtualbox" do |vb|
-      vb.memory = "128"
+      vb.memory = "256"
       vb.cpus = "1"
     end
   end