commit a2a46ae472cf348c9a7d1bac38831b673a9883ba
author David K. Bainbridge <dbainbri@ciena.com> Tue Oct 24 14:05:33 2017 -0700
committer David Bainbridge <dbainbri@ciena.com> Thu Oct 26 06:59:10 2017 -0700
tree 389a559a11c504cc72642b6bc5f332c595da2f4f
parent 2e8e14e65dd8a1cb8ac51f52286addd522ce28fd

VOL-517 - depend on standard libvirt image and parameterize Jenkins a bit.

Change-Id: Ia2212012e112726dc30381e18f96b6b3daad9f25

Vagrantfile

diff --git a/Vagrantfile b/Vagrantfile
index 7806a05..b95e831 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -3,7 +3,13 @@
 
 require 'yaml'
 
-settings = YAML.load_file 'settings.vagrant.yaml'
+if ENV['VAGRANT_SETTINGS'] and ENV['VAGRANT_SETTINGS'] != ''
+  settings_file = ENV['VAGRANT_SETTINGS']
+else
+  settings_file = 'settings.vagrant.yaml'
+end
+puts("Loading vagrant settings from " + settings_file)
+settings = YAML.load_file settings_file
 
 Vagrant.configure(2) do |config|
 
@@ -21,13 +27,14 @@
       Provider = "virtualbox"
     else
       puts("Using the QEMU/KVM configuration");
-      Box = "ubuntu1604"
+      Box = "elastic/ubuntu-16.04-x86_64"
       Provider = "libvirt"
       if settings['testMode'] == "true" or settings['installMode'] == "true"
           config.vm.synced_folder ".", "/vagrant", disabled: true
           config.vm.synced_folder "../..", "/cord", type: "rsync", rsync__exclude: [".git", "venv-linux", "install/volthaInstaller", "install/volthaInstaller-2"], rsync__args: ["--verbose", "--archive", "--delete", "-z", "--links"]
       else
-          config.vm.synced_folder "../..", "/cord", type: "nfs"
+          config.vm.synced_folder ".", "/vagrant", rsync__exclude: [".git", "venv-linux", "install/volthaInstaller", "install/volthaInstaller-2"], rsync__args: ["--verbose", "--archive", "--delete", "-z", "--links"]
+          config.vm.synced_folder "../..", "/cord", type: "nfs", rsync__exclude: [".git", "venv-linux", "install/volthaInstaller", "install/volthaInstaller-2"], rsync__args: ["--verbose", "--archive", "--delete", "-z", "--links"]
       end
     end
   else