commit 82f24ca5c1f524961d10f5422fd2b409049920ed
author Zack Williams <zdw@opennetworking.org> Sat Dec 30 13:53:46 2017 -0700
committer Zack Williams <zdw@opennetworking.org> Mon Jan 01 22:43:15 2018 -0700
tree 94c4049d2b534d674ced8e2d1053dd7c9c5c8c31
parent 3316e607d5f11f52835268f6921857f24573d111

[CORD-2463]
Make box used by Vagrant VM's a parameter

Change-Id: I19437de9126146a4e102b6db3288e6ae73b1354a

scripts/cord-bootstrap.sh

diff --git a/scripts/cord-bootstrap.sh b/scripts/cord-bootstrap.sh
index cbfcfc0..34ac885 100755
--- a/scripts/cord-bootstrap.sh
+++ b/scripts/cord-bootstrap.sh
@@ -125,28 +125,20 @@
   echo "Installing vagrant plugins if needed..."
   vagrant plugin list | grep -q vagrant-libvirt || vagrant plugin install vagrant-libvirt --plugin-version ${VAGRANT_LIBVIRT_VERSION}
   vagrant plugin list | grep -q vagrant-hosts || vagrant plugin install vagrant-hosts
+  vagrant plugin list | grep -q vagrant-mutate || vagrant plugin install vagrant-mutate
 
   echo "Obtaining libvirt image of Ubuntu"
 
   if [[ $XENIAL -eq 1 ]]; then
-    add_xenial
+    UBUNTU_VERSION=${UBUNTU_VERSION:-bento/ubuntu-16.04}
   else
-    add_trusty
+    UBUNTU_VERSION=${UBUNTU_VERSION:-ubuntu/trusty64}
   fi
-}
 
-function add_trusty() {
-  UBUNTU_VERSION=${UBUNTU_VERSION:-ubuntu/trusty64}
-  vagrant plugin list | grep -q vagrant-mutate || vagrant plugin install vagrant-mutate
-  vagrant box list | grep ${UBUNTU_VERSION} | grep virtualbox || vagrant box add ${UBUNTU_VERSION}
+  vagrant box list | grep ${UBUNTU_VERSION} | grep virtualbox || vagrant box add --provider virtualbox ${UBUNTU_VERSION}
   vagrant box list | grep ${UBUNTU_VERSION} | grep libvirt || vagrant mutate ${UBUNTU_VERSION} libvirt --input-provider virtualbox
 }
 
-function add_xenial() {
-  UBUNTU_VERSION=${UBUNTU_VERSION:-generic/ubuntu1604}
-  vagrant box list | grep ${UBUNTU_VERSION} | grep libvirt || vagrant box add --provider libvirt ${UBUNTU_VERSION}
-}
-
 function cloudlab_setup() {
 
   # Don't do anything if not a CloudLab node