github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unused libvirt config 

Signed-off-by: Manuel Buil <mbuil@suse.com>
pull/7758/head
Manuel Buil 2023-06-12 11:03:26 +02:00
parent cb114a2d91
commit 75bd429059
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", vm.network "private_network",
:ip => node_ip4, :ip => node_ip4,
:netmask => "255.255.255.0", :netmask => "255.255.255.0",
:libvirt__dhcp_enabled => false,
:libvirt__forward_mode => "none",
:libvirt__guest_ipv6 => "yes", :libvirt__guest_ipv6 => "yes",
:libvirt__ipv6_address => "#{NETWORK6_PREFIX}::1", :libvirt__ipv6_address => "#{NETWORK6_PREFIX}::1",
:libvirt__ipv6_prefix => "64" :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}" vm.hostname = "#{roles[0]}-#{role_num}"
node_ip4 = "#{NETWORK4_PREFIX}.#{100+node_num}" node_ip4 = "#{NETWORK4_PREFIX}.#{100+node_num}"
node_ip4_public = "#{PUBLIC_NETWORK4_PREFIX}.#{100+node_num}" node_ip4_public = "#{PUBLIC_NETWORK4_PREFIX}.#{100+node_num}"
vm.network "private_network", vm.network "private_network", :ip => node_ip4, :netmask => "255.255.255.0"
:ip => node_ip4, vm.network "private_network", :ip => node_ip4_public, :netmask => "255.255.255.0"
: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"
scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts" scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts"
vagrant_defaults = File.exists?("./vagrantdefaults.rb") ? "./vagrantdefaults.rb" : "../vagrantdefaults.rb" 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", vm.network "private_network",
:ip => node_ip4, :ip => node_ip4,
:netmask => "255.255.255.0", :netmask => "255.255.255.0",
:libvirt__dhcp_enabled => false,
:libvirt__forward_mode => "none",
:libvirt__guest_ipv6 => "yes", :libvirt__guest_ipv6 => "yes",
:libvirt__ipv6_address => "#{NETWORK6_PREFIX}::1", :libvirt__ipv6_address => "#{NETWORK6_PREFIX}::1",
:libvirt__ipv6_prefix => "64" :libvirt__ipv6_prefix => "64"