From 85999db47c5f2292968c91184021bd220c7cd246 Mon Sep 17 00:00:00 2001
From: Guo Ruijing <ruijing.guo@intel.com>
Date: Sun, 26 Nov 2017 15:02:37 -0500
Subject: support vagrant/libvirt

1. add cleanup for libvirt
2. use libvirt for deployments
3. use yk0/ubuntu-xenial box
4. update sleep time to reduce log size

Change-Id: Ie1f0acc6a496180c4d73ade5f724434400fef1f7
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
---
 src/vagrant/kubeadm_multus/Vagrantfile        | 16 ++++++----------
 src/vagrant/kubeadm_multus/deploy.sh          |  5 ++---
 src/vagrant/kubeadm_multus/examples/multus.sh |  4 ++--
 3 files changed, 10 insertions(+), 15 deletions(-)

(limited to 'src/vagrant/kubeadm_multus')

diff --git a/src/vagrant/kubeadm_multus/Vagrantfile b/src/vagrant/kubeadm_multus/Vagrantfile
index bda421f..2007519 100644
--- a/src/vagrant/kubeadm_multus/Vagrantfile
+++ b/src/vagrant/kubeadm_multus/Vagrantfile
@@ -3,17 +3,13 @@ $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.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 "post-boot",["controlvm", :id, "setlinkstate1", "on"]
+  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.define "master" do |config|
diff --git a/src/vagrant/kubeadm_multus/deploy.sh b/src/vagrant/kubeadm_multus/deploy.sh
index a0e7843..9c9e51e 100755
--- a/src/vagrant/kubeadm_multus/deploy.sh
+++ b/src/vagrant/kubeadm_multus/deploy.sh
@@ -4,7 +4,6 @@ set -ex
 DIR="$(dirname `readlink -f $0`)"
 
 cd $DIR
-vagrant destroy -f
+../cleanup.sh
 vagrant up
-vagrant ssh master -c "/vagrant/examples/multus.sh" || (vagrant destroy -f; exit 1)
-vagrant destroy -f
+vagrant ssh master -c "/vagrant/examples/multus.sh"
diff --git a/src/vagrant/kubeadm_multus/examples/multus.sh b/src/vagrant/kubeadm_multus/examples/multus.sh
index 92e95ab..d7b39a0 100755
--- a/src/vagrant/kubeadm_multus/examples/multus.sh
+++ b/src/vagrant/kubeadm_multus/examples/multus.sh
@@ -20,7 +20,7 @@ set -ex
 while true
 do
     kubectl get pods -n kube-system | grep kube-cnimultus-ds | grep -v Run | wc -l | grep "^0$" && break
-    sleep 20
+    sleep 60
 done
 
 kubectl delete rc --all
@@ -28,8 +28,8 @@ kubectl apply -f /vagrant/examples/busybox.yaml
 r="0"
 while [ $r -ne "2" ]
 do
-   sleep 10
    r=$(kubectl get pods | grep Running | wc -l)
+   sleep 60
 done
 
 kubectl get pods --all-namespaces
-- 
cgit 1.2.3-korg