Merge "Configure Vagrants for both ORD & DFW"

diff --git a/vagrant/basic-builder/Vagrantfile b/vagrant/basic-builder/Vagrantfile
index e9ea15751c8a3f388044b45986b6271cfaa1e97b..53a5006d06dea258dca25fd527c950917ada88ec 100644 (file)
--- a/vagrant/basic-builder/Vagrantfile
+++ b/vagrant/basic-builder/Vagrantfile
@@ -34,6 +34,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     # create these base builds always on the smallest system possible
     rs.flavor = 'general1-1'
 
+    # 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']

diff --git a/vagrant/basic-java-node/Vagrantfile b/vagrant/basic-java-node/Vagrantfile
index 3c685506007ecc930cb9f4f8c06ca11d3b23744c..53a5006d06dea258dca25fd527c950917ada88ec 100644 (file)
--- a/vagrant/basic-java-node/Vagrantfile
+++ b/vagrant/basic-java-node/Vagrantfile
@@ -32,7 +32,14 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   #         in your base box
   config.vm.provider :rackspace do |rs|
     # create these base builds always on the smallest system possible
-    rs.flavor = 'performance1-1'
+    rs.flavor = 'general1-1'
+
+    # 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

diff --git a/vagrant/basic-mininet-node/Vagrantfile b/vagrant/basic-mininet-node/Vagrantfile
index 3c685506007ecc930cb9f4f8c06ca11d3b23744c..53a5006d06dea258dca25fd527c950917ada88ec 100644 (file)
--- a/vagrant/basic-mininet-node/Vagrantfile
+++ b/vagrant/basic-mininet-node/Vagrantfile
@@ -32,7 +32,14 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   #         in your base box
   config.vm.provider :rackspace do |rs|
     # create these base builds always on the smallest system possible
-    rs.flavor = 'performance1-1'
+    rs.flavor = 'general1-1'
+
+    # 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

diff --git a/vagrant/integration-robotframework/Vagrantfile b/vagrant/integration-robotframework/Vagrantfile
index 3c685506007ecc930cb9f4f8c06ca11d3b23744c..53a5006d06dea258dca25fd527c950917ada88ec 100644 (file)
--- a/vagrant/integration-robotframework/Vagrantfile
+++ b/vagrant/integration-robotframework/Vagrantfile
@@ -32,7 +32,14 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   #         in your base box
   config.vm.provider :rackspace do |rs|
     # create these base builds always on the smallest system possible
-    rs.flavor = 'performance1-1'
+    rs.flavor = 'general1-1'
+
+    # 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

diff --git a/vagrant/ovsdb-devstack/Vagrantfile b/vagrant/ovsdb-devstack/Vagrantfile
index fcb64d8931d0a30953591d5f6b12a8de944d6eb7..790e7ce85b4d3a943f07a9b94f47432fb012835c 100644 (file)
--- a/vagrant/ovsdb-devstack/Vagrantfile
+++ b/vagrant/ovsdb-devstack/Vagrantfile
@@ -32,7 +32,14 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   #         in your base box
   config.vm.provider :rackspace do |rs|
     # create these base builds always on the smallest system possible
-    rs.flavor = 'performance1-1'
+    rs.flavor = 'general1-1'
+
+    # 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 Fedora 20 Vagrant ready image unless overriden by a RSIMAGE
     # environment variable

diff --git a/vagrant/ovsdb-docker/Vagrantfile b/vagrant/ovsdb-docker/Vagrantfile
index 1a84d65e47151b60505f229096b46bb1b2b4ddf1..8e543d5ef0a44679dcd8f8f708570dcdac0bbdb4 100644 (file)
--- a/vagrant/ovsdb-docker/Vagrantfile
+++ b/vagrant/ovsdb-docker/Vagrantfile
@@ -32,7 +32,14 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   #         in your base box
   config.vm.provider :rackspace do |rs|
     # create these base builds always on the smallest system possible
-    rs.flavor = 'performance1-1'
+    rs.flavor = 'general1-1'
+
+    # 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 Fedora 20 (Heisenbug) - Vagrant ready image unless overriden by a RSIMAGE
     # environment variable

diff --git a/vagrant/rackspace-convert-base/Vagrantfile b/vagrant/rackspace-convert-base/Vagrantfile
index f9da867dd723c006bdbea6dfe4809076b57932c2..fdcd9a51140379bdf5507a6def6f12b59c22ab1a 100644 (file)
--- a/vagrant/rackspace-convert-base/Vagrantfile
+++ b/vagrant/rackspace-convert-base/Vagrantfile
@@ -38,7 +38,14 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   #         in your base box
   config.vm.provider :rackspace do |rs|
     # create these base builds always on the smallest system possible
-    rs.flavor = 'performance1-1'
+    rs.flavor = 'general1-1'
+
+    # 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 to the Fedora 20 image unless overridden by a RSIMAGE
     # environment variable