openstack
/
octavia
Code Issues Proposed changes

Merge "Change default vagrant box to xenial64(16.04)"

This commit is contained in:
Jenkins 2017-06-29 00:51:13 +00:00 committed by Gerrit Code Review
parent 31489b9435 a7256e15ed
commit dac945260d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/samples/providers.rb
View File

@ -5,14 +5,14 @@ VM_CPUS = ENV['VM_CPUS'] || "1"
def configure_providers(vm)
vm.provider "virtualbox" do |vb, config|
config.vm.box = "ubuntu/trusty64"
config.vm.box = "ubuntu/xenial64"
vb.gui = true
vb.memory = VM_MEMORY
vb.cpus = VM_CPUS
end
vm.provider "libvirt" do |lb, config|
config.vm.box = "celebdor/trusty64"
config.vm.box = "celebdor/xenial64"
config.vm.synced_folder './', '/vagrant', type: 'rsync'
lb.nested = true
lb.memory = VM_MEMORY

4
devstack/samples/singlenode/Vagrantfile vendored
View File

@ -17,7 +17,7 @@ Vagrant.configure(2) do |config|
# Every Vagrant development environment requires a box. You can search for
# boxes at https://atlas.hashicorp.com/search.
config.vm.box = "ubuntu/trusty64"
config.vm.box = "ubuntu/xenial64"
# Disable automatic box update checking. If you disable this, then
# boxes will only be checked for updates when the user runs
@ -57,7 +57,7 @@ Vagrant.configure(2) do |config|
end
config.vm.provider "libvirt" do |lb, config|
config.vm.box = "celebdor/trusty64"
config.vm.box = "celebdor/xenial64"
config.vm.synced_folder './', '/vagrant', type: 'rsync'
lb.nested = true
lb.memory = VM_MEMORY