Merge branch 'master' into single-ip-address

This commit is contained in:
mergify[bot] 2021-01-27 10:38:39 +00:00 committed by GitHub
commit 141083e24d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -22,8 +22,12 @@ Vagrant.configure('2') do |config|
provisioner.vm.network :private_network, provisioner.vm.network :private_network,
virtualbox__intnet: "tink_network", virtualbox__intnet: "tink_network",
libvirt__network_name: "tink_network",
libvirt__host_ip: "192.168.1.6",
libvirt__netmask: "255.255.255.248",
libvirt__dhcp_enabled: false, libvirt__dhcp_enabled: false,
libvirt__forward_mode: 'none', libvirt__forward_mode: 'none',
libvirt__adapter: 1,
auto_config: false auto_config: false
provisioner.vm.network "forwarded_port", guest: 42113, host: 42113 provisioner.vm.network "forwarded_port", guest: 42113, host: 42113
@ -47,6 +51,7 @@ Vagrant.configure('2') do |config|
worker.vm.network :private_network, worker.vm.network :private_network,
mac: "080027000001", mac: "080027000001",
virtualbox__intnet: "tink_network", virtualbox__intnet: "tink_network",
libvirt__network_name: "tink_network",
libvirt__dhcp_enabled: false, libvirt__dhcp_enabled: false,
libvirt__forward_mode: 'none', libvirt__forward_mode: 'none',
auto_config: false auto_config: false
@ -56,6 +61,8 @@ Vagrant.configure('2') do |config|
lv.cpus = 1 lv.cpus = 1
lv.boot 'network' lv.boot 'network'
lv.mgmt_attach = false lv.mgmt_attach = false
lv.storage :file, :size => '40G'
lv.random :model => 'random'
end end
worker.vm.provider :virtualbox do |vb, worker| worker.vm.provider :virtualbox do |vb, worker|