upstream/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2026-06-08 16:26:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #7745 from manuelbuil/removeVagrantConfig

Browse source 
Remove useless libvirt config
This commit is contained in:
Manuel Buil 2023-06-12 18:15:28 +02:00 committed by GitHub
commit 55db9b18f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/e2e/dualstack/Vagrantfile vendored
View file

@ -21,8 +21,6 @@ def provision(vm, roles, role_num, node_num)
vm.network "private_network",
:ip => node_ip4,
:netmask => "255.255.255.0",
:libvirt__dhcp_enabled => false,
:libvirt__forward_mode => "none",
:libvirt__guest_ipv6 => "yes",
:libvirt__ipv6_address => "#{NETWORK6_PREFIX}::1",
:libvirt__ipv6_prefix => "64"

12
tests/e2e/externalip/Vagrantfile vendored
View file

@ -16,16 +16,8 @@ def provision(vm, roles, role_num, node_num)
vm.hostname = "#{roles[0]}-#{role_num}"
node_ip4 = "#{NETWORK4_PREFIX}.#{100+node_num}"
node_ip4_public = "#{PUBLIC_NETWORK4_PREFIX}.#{100+node_num}"
vm.network "private_network",
:ip => node_ip4,
:netmask => "255.255.255.0",
:libvirt__dhcp_enabled => false,
:libvirt__forward_mode => "none"
vm.network "private_network",
:ip => node_ip4_public,
:netmask => "255.255.255.0",
:libvirt__dhcp_enabled => false,
:libvirt__forward_mode => "none"
vm.network "private_network", :ip => node_ip4, :netmask => "255.255.255.0"
vm.network "private_network", :ip => node_ip4_public, :netmask => "255.255.255.0"
scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts"
vagrant_defaults = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb"

2
tests/e2e/multiclustercidr/Vagrantfile vendored
View file

@ -22,8 +22,6 @@ def provision(vm, roles, role_num, node_num)
vm.network "private_network",
:ip => node_ip4,
:netmask => "255.255.255.0",
:libvirt__dhcp_enabled => false,
:libvirt__forward_mode => "none",
:libvirt__guest_ipv6 => "yes",
:libvirt__ipv6_address => "#{NETWORK6_PREFIX}::1",
:libvirt__ipv6_prefix => "64"