Skip to content

K
k3s
Unverified Commit 55db9b18 authored by Manuel Buil's avatar Manuel Buil Committed by GitHub
Browse files
Options

Merge pull request #7745 from manuelbuil/removeVagrantConfig

Remove useless libvirt config
parents 318ef4e0 a5874f85
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 14 deletions
tests/e2e/dualstack/Vagrantfile
View file @ 55db9b18
...@@ -21,8 +21,6 @@ def provision(vm, roles, role_num, node_num) ...@@ -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"
......
tests/e2e/externalip/Vagrantfile
View file @ 55db9b18
...@@ -16,16 +16,8 @@ def provision(vm, roles, role_num, node_num) ...@@ -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"
......
tests/e2e/multiclustercidr/Vagrantfile
View file @ 55db9b18
...@@ -22,8 +22,6 @@ def provision(vm, roles, role_num, node_num) ...@@ -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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment