diff options
| author |   Guo Ruijing <ruijing.guo@intel.com> | 2017-11-26 15:02:37 -0500 |
|---|---|---|
| committer | Guo Ruijing <ruijing.guo@intel.com> | 2017-11-29 14:28:08 -0500 |
| commit | 85999db47c5f2292968c91184021bd220c7cd246 (patch) | |
| tree | 46f74b6f63fae35ca2dbc5683bbe0d5560d1589e /src/vagrant/kubeadm_virtlet | |
| parent | cc076fe7ba6bdc7b5298ed7b19a15cad37af0307 (diff) | |
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>
Diffstat (limited to 'src/vagrant/kubeadm_virtlet')
| -rw-r--r-- | src/vagrant/kubeadm_virtlet/Vagrantfile | 13 | ||||
| -rwxr-xr-x | src/vagrant/kubeadm_virtlet/deploy.sh | 5 | ||||
| -rwxr-xr-x | src/vagrant/kubeadm_virtlet/examples/virtlet.sh | 2 |
3 files changed, 8 insertions, 12 deletions
diff --git a/src/vagrant/kubeadm_virtlet/Vagrantfile b/src/vagrant/kubeadm_virtlet/Vagrantfile index 1cc8e58..83c66d4 100644 --- a/src/vagrant/kubeadm_virtlet/Vagrantfile +++ b/src/vagrant/kubeadm_virtlet/Vagrantfile @@ -3,16 +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.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_virtlet/deploy.sh b/src/vagrant/kubeadm_virtlet/deploy.sh index 758abb5..c2540a8 100755 --- a/src/vagrant/kubeadm_virtlet/deploy.sh +++ b/src/vagrant/kubeadm_virtlet/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/virtlet.sh" || (vagrant destroy -f; exit 1) -vagrant destroy -f +vagrant ssh master -c "/vagrant/examples/virtlet.sh" diff --git a/src/vagrant/kubeadm_virtlet/examples/virtlet.sh b/src/vagrant/kubeadm_virtlet/examples/virtlet.sh index 70bb606..cac1882 100755 --- a/src/vagrant/kubeadm_virtlet/examples/virtlet.sh +++ b/src/vagrant/kubeadm_virtlet/examples/virtlet.sh @@ -14,7 +14,7 @@ r="0" while [ $r -ne "1" ] do r=$(kubectl get pods | grep Running | wc -l) - sleep 20 + sleep 60 done sleep 60 kubectl get pods -o json | grep podIP | cut -f4 -d'"' | xargs ping -c 4 |