openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "Fix installation with Vagrant"

This commit is contained in:
Zuul 2020-10-13 08:14:52 +00:00 committed by Gerrit Code Review
parent 027d802a70 8799fa9685
commit c4dcfdf2c1
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/vagrant/Vagrantfile vendored
View File

@ -9,21 +9,21 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.hostname = 'devstack' config.vm.hostname = 'devstack'
config.vm.provider 'virtualbox' do |v, override| config.vm.provider 'virtualbox' do |v, override|
override.vm.box = ENV.fetch('VAGRANT_KURYR_VM_BOX', 'bento/ubuntu-16.04') override.vm.box = ENV.fetch('VAGRANT_KURYR_VM_BOX', 'generic/ubuntu1804')
v.memory = VM_MEMORY v.memory = VM_MEMORY
v.cpus = VM_CPUS v.cpus = VM_CPUS
v.customize "post-boot", ['controlvm', :id, 'setlinkstate1', 'on'] v.customize "post-boot", ['controlvm', :id, 'setlinkstate1', 'on']
end end
config.vm.provider 'parallels' do |v, override| config.vm.provider 'parallels' do |v, override|
override.vm.box = ENV.fetch('VAGRANT_KURYR_VM_BOX', 'bento/ubuntu-16.04') override.vm.box = ENV.fetch('VAGRANT_KURYR_VM_BOX', 'generic/ubuntu1804')
v.memory = VM_MEMORY v.memory = VM_MEMORY
v.cpus = VM_CPUS v.cpus = VM_CPUS
v.customize ['set', :id, '--nested-virt', 'on'] v.customize ['set', :id, '--nested-virt', 'on']
end end
config.vm.provider 'libvirt' do |v, override| config.vm.provider 'libvirt' do |v, override|
override.vm.box = ENV.fetch('VAGRANT_KURYR_VM_BOX', 'yk0/ubuntu-xenial') override.vm.box = ENV.fetch('VAGRANT_KURYR_VM_BOX', 'generic/ubuntu1804')
v.memory = VM_MEMORY v.memory = VM_MEMORY
v.cpus = VM_CPUS v.cpus = VM_CPUS
v.nested = true v.nested = true

4
contrib/vagrant/vagrant.sh
View File

@ -17,5 +17,9 @@ export HOST_IP=127.0.0.1
# run script # run script
bash /vagrant/devstack.sh "$1" bash /vagrant/devstack.sh "$1"
# Enable IPv6
sudo sysctl -w net.ipv6.conf.default.disable_ipv6=0
sudo sysctl -w net.ipv6.conf.all.disable_ipv6=0
#set environment variables for kuryr #set environment variables for kuryr
su "$OS_USER" -c "echo 'source /vagrant/config/kuryr_rc' >> ~/.bash_profile" su "$OS_USER" -c "echo 'source /vagrant/config/kuryr_rc' >> ~/.bash_profile"