diff options
Diffstat (limited to 'src/vagrant/kubeadm_ovsdpdk')
| -rw-r--r-- | src/vagrant/kubeadm_ovsdpdk/Vagrantfile | 16 | ||||
| -rwxr-xr-x | src/vagrant/kubeadm_ovsdpdk/deploy.sh | 5 | ||||
| -rwxr-xr-x | src/vagrant/kubeadm_ovsdpdk/examples/virtio-user.sh | 8 |
3 files changed, 12 insertions, 17 deletions
diff --git a/src/vagrant/kubeadm_ovsdpdk/Vagrantfile b/src/vagrant/kubeadm_ovsdpdk/Vagrantfile index 2d69109..5d51e5a 100644 --- a/src/vagrant/kubeadm_ovsdpdk/Vagrantfile +++ b/src/vagrant/kubeadm_ovsdpdk/Vagrantfile @@ -3,18 +3,14 @@ $num_workers=2 Vagrant.require_version ">= 1.8.6" Vagrant.configure("2") do |config| - config.vm.box = "opnfv/container4nfv" - config.vm.box_version = "0" + config.vm.box = "yk0/ubuntu-xenial" + config.vm.provider :libvirt do |libvirt| + libvirt.memory = 4096 + libvirt.cpus = 4 + end + config.vm.synced_folder "../..", "/src" config.vm.provision "shell", path: "host_setup.sh", privileged: false - config.vm.provider :virtualbox do |vb| - vb.customize ["modifyvm", :id, "--memory", 4096] - vb.customize ["modifyvm", :id, "--cpus", 4] - vb.customize ["modifyvm", :id, "--nicpromisc3", "allow-all"] - 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"] - end config.vm.define "master" do |config| config.vm.hostname = "master" diff --git a/src/vagrant/kubeadm_ovsdpdk/deploy.sh b/src/vagrant/kubeadm_ovsdpdk/deploy.sh index 2cf96b9..2a32d28 100755 --- a/src/vagrant/kubeadm_ovsdpdk/deploy.sh +++ b/src/vagrant/kubeadm_ovsdpdk/deploy.sh @@ -4,8 +4,7 @@ set -ex DIR="$(dirname `readlink -f $0`)" cd $DIR -vagrant destroy -f +../cleanup.sh rm -rf container-ipam-state vagrant up -vagrant ssh master -c "/vagrant/examples/virtio-user.sh" || (vagrant destroy -f; exit 1) -vagrant destroy -f +vagrant ssh master -c "/vagrant/examples/virtio-user.sh" diff --git a/src/vagrant/kubeadm_ovsdpdk/examples/virtio-user.sh b/src/vagrant/kubeadm_ovsdpdk/examples/virtio-user.sh index 0cd9d0e..c208300 100755 --- a/src/vagrant/kubeadm_ovsdpdk/examples/virtio-user.sh +++ b/src/vagrant/kubeadm_ovsdpdk/examples/virtio-user.sh @@ -23,7 +23,7 @@ r="0" while [ $r -ne "6" ] do r=$(kubectl get pods --all-namespaces | grep ovsdpdk | grep Run | wc -l) - sleep 20 + sleep 60 done kubectl delete rc --all @@ -32,8 +32,8 @@ r="0" while [ $r -ne "2" ] do r=$(kubectl get pods | grep Running | wc -l) - sleep 20 + sleep 60 done kubectl get pods --all-namespaces -sleep 20 -ping -c4 10.244.0.103 || ping -c4 10.244.0.104 +sleep 60 +kubectl get pods -o wide | awk 'NF>1 && NR>1 {print $1}' | xargs -I {} kubectl exec -i {} vppctl ping 10.244.0.10 |