From a5874f855f54dfa16d884acb3d047cc6f97c2505 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Mon, 12 Jun 2023 11:03:26 +0200 Subject: [PATCH] Remove unused libvirt config Signed-off-by: Manuel Buil --- tests/e2e/dualstack/Vagrantfile | 2 -- tests/e2e/externalip/Vagrantfile | 12 ++---------- tests/e2e/multiclustercidr/Vagrantfile | 2 -- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/tests/e2e/dualstack/Vagrantfile b/tests/e2e/dualstack/Vagrantfile index 633729a800..b81b06c263 100644 --- a/tests/e2e/dualstack/Vagrantfile +++ b/tests/e2e/dualstack/Vagrantfile @@ -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" diff --git a/tests/e2e/externalip/Vagrantfile b/tests/e2e/externalip/Vagrantfile index eb6f26cdfa..7c2e5d6499 100644 --- a/tests/e2e/externalip/Vagrantfile +++ b/tests/e2e/externalip/Vagrantfile @@ -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" diff --git a/tests/e2e/multiclustercidr/Vagrantfile b/tests/e2e/multiclustercidr/Vagrantfile index 1655c38ec5..832a40d815 100644 --- a/tests/e2e/multiclustercidr/Vagrantfile +++ b/tests/e2e/multiclustercidr/Vagrantfile @@ -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"