Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Activate l2switch verify with JDK8"
[releng/builder.git]
/
vagrant
/
basic-builder
/
Vagrantfile
diff --git
a/vagrant/basic-builder/Vagrantfile
b/vagrant/basic-builder/Vagrantfile
index a71c67abdc2fd78b97b3e1acc11f2b5897961e7b..53a5006d06dea258dca25fd527c950917ada88ec 100644
(file)
--- a/
vagrant/basic-builder/Vagrantfile
+++ b/
vagrant/basic-builder/Vagrantfile
@@
-34,12
+34,19
@@
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# create these base builds always on the smallest system possible
rs.flavor = 'general1-1'
# 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
# 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
end
end