X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=vagrant%2Fbasic-builder%2FVagrantfile;h=46e61bfd5308321352f31bee6cf41d0b164b3593;hb=82024e6aca3c36bbee4e00f34e91f79367955a7a;hp=a71c67abdc2fd78b97b3e1acc11f2b5897961e7b;hpb=e9bff86e0640b06814ed90a221255e55ad35cae1;p=releng%2Fbuilder.git

diff --git a/vagrant/basic-builder/Vagrantfile b/vagrant/basic-builder/Vagrantfile
index a71c67abd..46e61bfd5 100644
--- a/vagrant/basic-builder/Vagrantfile
+++ b/vagrant/basic-builder/Vagrantfile
@@ -34,22 +34,49 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # create these base builds always on the smallest system possible
     rs.flavor = 'general1-1'
 
-    # Default the CentOS 7 - Vagrant ready image unless overriden by a RSIMAGE
+    # allow for switching to ORD cloud but default to DFW
+    if (ENV['RSREGION'] == 'ord')
+      rs.rackspace_region = :ord
+    else
+      rs.rackspace_region = :dfw
+    end
+
+    # Default the CentOS 6.5 - Vagrant ready image unless overriden by a RSIMAGE
     # environment variable
     if ENV['RSIMAGE']
       rs.image = ENV['RSIMAGE']
     else
-      rs.image = 'CentOS 7 - Vagrant ready'
+      rs.image = 'CentOS 6.5 - Vagrant ready'
     end
   end
 
+  # Explicitlly set default shared folder and load lib folder
+  config.vm.synced_folder ".", "/vagrant"
+  config.vm.synced_folder "../lib/", "/vagrant/lib"
+
   # run our bootstrapping for the ovsdb-devstack system
   config.vm.provision 'shell', path: 'bootstrap.sh'
 
+
+  #################
+  # LF NETWORKING #
+  #################
+
+  if ENV['LFNETWORK']
+    # reconfigure the network setup to support our special private setup
+    config.vm.provision 'shell', path: '../lib/lf-networking/configure_lf_infra.sh',
+      args: ENV['RSSUBDOMAIN']
+  end
+
+
+  #################
+  # FINAL CLEANUP #
+  #################
+
   # set RSRESEAL to... anything if you want to snap an image of this box
   # not setting the environment variable will cause the system to come
   # up fully and not be in a resealable state
   if ENV['RSRESEAL']
-    config.vm.provision 'shell', path: 'system_reseal.sh'
+    config.vm.provision 'shell', path: '../lib/system_reseal.sh'
   end
 end