From 5f41686bc6a09307e346bbbf980ab45df7ac9ced Mon Sep 17 00:00:00 2001 From: Guo Ruijing Date: Tue, 7 Nov 2017 15:23:39 -0800 Subject: add cleanup for container4nfv 1. move interface cleanup to cleanup.sh 2. can destroy vms after jenkins abort Change-Id: I627070ace6fa5cded507964091c40784ce4a19f9 Signed-off-by: Guo Ruijing --- src/vagrant/kubeadm_basic/Vagrantfile | 1 - src/vagrant/kubeadm_multus/Vagrantfile | 1 - src/vagrant/kubeadm_ovsdpdk/Vagrantfile | 1 - src/vagrant/kubeadm_virtlet/Vagrantfile | 1 - 4 files changed, 4 deletions(-) (limited to 'src') diff --git a/src/vagrant/kubeadm_basic/Vagrantfile b/src/vagrant/kubeadm_basic/Vagrantfile index 3b20f3a..7325ac0 100644 --- a/src/vagrant/kubeadm_basic/Vagrantfile +++ b/src/vagrant/kubeadm_basic/Vagrantfile @@ -14,7 +14,6 @@ Vagrant.configure("2") do |config| vb.customize ["setextradata", :id, "VBoxInternal/CPUM/SSE4.1", "1"] vb.customize ["setextradata", :id, "VBoxInternal/CPUM/SSE4.2", "1"] vb.customize "post-boot",["controlvm", :id, "setlinkstate1", "on"] - vb.destroy_unused_network_interfaces = true end config.vm.define "master" do |config| diff --git a/src/vagrant/kubeadm_multus/Vagrantfile b/src/vagrant/kubeadm_multus/Vagrantfile index acc1852..998edb2 100644 --- a/src/vagrant/kubeadm_multus/Vagrantfile +++ b/src/vagrant/kubeadm_multus/Vagrantfile @@ -10,7 +10,6 @@ Vagrant.configure("2") do |config| vb.customize ["modifyvm", :id, "--cpus", 4] vb.customize ["modifyvm", :id, "--nicpromisc3", "allow-all"] vb.customize "post-boot",["controlvm", :id, "setlinkstate1", "on"] - vb.destroy_unused_network_interfaces = true end config.vm.provision "shell", path: "host_setup.sh", privileged: false diff --git a/src/vagrant/kubeadm_ovsdpdk/Vagrantfile b/src/vagrant/kubeadm_ovsdpdk/Vagrantfile index 3dba56b..dfce7f3 100644 --- a/src/vagrant/kubeadm_ovsdpdk/Vagrantfile +++ b/src/vagrant/kubeadm_ovsdpdk/Vagrantfile @@ -13,7 +13,6 @@ Vagrant.configure("2") do |config| vb.customize ["setextradata", :id, "VBoxInternal/CPUM/SSE4.1", "1"] vb.customize ["setextradata", :id, "VBoxInternal/CPUM/SSE4.2", "1"] vb.customize "post-boot",["controlvm", :id, "setlinkstate1", "on"] - vb.destroy_unused_network_interfaces = true end config.vm.define "master" do |config| diff --git a/src/vagrant/kubeadm_virtlet/Vagrantfile b/src/vagrant/kubeadm_virtlet/Vagrantfile index acc1852..998edb2 100644 --- a/src/vagrant/kubeadm_virtlet/Vagrantfile +++ b/src/vagrant/kubeadm_virtlet/Vagrantfile @@ -10,7 +10,6 @@ Vagrant.configure("2") do |config| vb.customize ["modifyvm", :id, "--cpus", 4] vb.customize ["modifyvm", :id, "--nicpromisc3", "allow-all"] vb.customize "post-boot",["controlvm", :id, "setlinkstate1", "on"] - vb.destroy_unused_network_interfaces = true end config.vm.provision "shell", path: "host_setup.sh", privileged: false -- cgit 1.2.3-korg