openstack/devstack-vagrant
Code Issues Proposed changes

Merge "Rewrite two if statements to improve readability"

Browse Source
This commit is contained in:
Jenkins
2014-09-03 14:17:11 +00:00
committed by Gerrit Code Review
parent af756b3d9d 54c8738d30
commit c3d5a9214a
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Vagrantfile vendored
View File

@@ -78,14 +78,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
#
# The boot time is long for these, so I recommend that you convert to a local
# version as soon as you can.
if conf['box_name']
config.vm.box = conf['box_name']
else
config.vm.box = 'ubuntu/trusty64'
end
if conf['box_url']
config.vm.box_url = conf['box_url']
end
config.vm.box = conf['box_name'] || 'ubuntu/trusty64'
config.vm.box_url = conf['box_url'] if conf['box_url']
if Vagrant.has_plugin?("vagrant-cachier")
config.cache.scope = :box