From 9f336c13e77998f09f57cec763e9508bc0062002 Mon Sep 17 00:00:00 2001 From: Guo Ruijing Date: Sun, 12 Nov 2017 13:59:25 -0500 Subject: update container4nfv deployment 1. use opnfv/container4nfv vagrant box to reduce installation time 2. reduce installation timeout 3. use same ip address for all deployment Change-Id: I0849590ada214f182c75bcdc9e72cb26dc6f6918 Signed-off-by: Guo Ruijing --- src/vagrant/kubeadm_basic/Vagrantfile | 5 ++--- src/vagrant/kubeadm_basic/deploy.sh | 4 ++-- src/vagrant/kubeadm_basic/master_setup.sh | 2 +- src/vagrant/kubeadm_basic/worker_setup.sh | 2 +- src/vagrant/kubeadm_multus/Vagrantfile | 9 ++++----- src/vagrant/kubeadm_multus/deploy.sh | 4 ++-- src/vagrant/kubeadm_multus/host_setup.sh | 10 +++++----- src/vagrant/kubeadm_multus/master_setup.sh | 2 +- src/vagrant/kubeadm_multus/worker_setup.sh | 2 +- src/vagrant/kubeadm_ovsdpdk/Vagrantfile | 5 ++--- src/vagrant/kubeadm_ovsdpdk/deploy.sh | 4 ++-- src/vagrant/kubeadm_ovsdpdk/master_setup.sh | 2 +- src/vagrant/kubeadm_ovsdpdk/worker_setup.sh | 2 +- src/vagrant/kubeadm_virtlet/Vagrantfile | 9 ++++----- src/vagrant/kubeadm_virtlet/deploy.sh | 4 ++-- src/vagrant/kubeadm_virtlet/host_setup.sh | 10 +++++----- src/vagrant/kubeadm_virtlet/master_setup.sh | 2 +- src/vagrant/kubeadm_virtlet/worker_setup.sh | 3 ++- 18 files changed, 39 insertions(+), 42 deletions(-) (limited to 'src') diff --git a/src/vagrant/kubeadm_basic/Vagrantfile b/src/vagrant/kubeadm_basic/Vagrantfile index 7325ac0..063e802 100644 --- a/src/vagrant/kubeadm_basic/Vagrantfile +++ b/src/vagrant/kubeadm_basic/Vagrantfile @@ -3,7 +3,8 @@ $num_workers=2 Vagrant.require_version ">= 1.8.6" Vagrant.configure("2") do |config| - config.vm.box = "bento/ubuntu-16.04" + 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 @@ -20,7 +21,6 @@ Vagrant.configure("2") do |config| config.vm.hostname = "master" config.vm.provision "shell", path: "master_setup.sh", privileged: false config.vm.network :private_network, ip: "192.168.1.10" - config.vm.network :private_network, ip: "10.244.0.10" end (1 .. $num_workers).each do |i| @@ -28,7 +28,6 @@ Vagrant.configure("2") do |config| config.vm.hostname = vm_name config.vm.provision "shell", path: "worker_setup.sh", privileged: false config.vm.network :private_network, ip: "192.168.1.#{i+20}" - config.vm.network :private_network, ip: "10.244.0.#{i+20}" end end diff --git a/src/vagrant/kubeadm_basic/deploy.sh b/src/vagrant/kubeadm_basic/deploy.sh index ae9f798..f5b810e 100755 --- a/src/vagrant/kubeadm_basic/deploy.sh +++ b/src/vagrant/kubeadm_basic/deploy.sh @@ -1,8 +1,8 @@ #!/bin/bash set -ex -HOME="$(dirname `readlink -f $0`)" +DIR="$(dirname `readlink -f $0`)" -cd $HOME +cd $DIR vagrant up vagrant destroy -f diff --git a/src/vagrant/kubeadm_basic/master_setup.sh b/src/vagrant/kubeadm_basic/master_setup.sh index bcbda09..0e33177 100644 --- a/src/vagrant/kubeadm_basic/master_setup.sh +++ b/src/vagrant/kubeadm_basic/master_setup.sh @@ -2,7 +2,7 @@ set -ex -sudo timeout 3600 kubeadm init --apiserver-advertise-address 192.168.1.10 --service-cidr=192.168.1.0/24 --pod-network-cidr=10.244.0.0/16 --token 8c5adc.1cec8dbf339093f0 +sudo timeout 600 kubeadm init --apiserver-advertise-address=192.168.1.10 --service-cidr=192.168.1.0/24 --pod-network-cidr=10.244.0.0/16 --token 8c5adc.1cec8dbf339093f0 sudo cp /etc/kubernetes/admin.conf $HOME/ sudo chown $(id -u):$(id -g) $HOME/admin.conf export KUBECONFIG=$HOME/admin.conf diff --git a/src/vagrant/kubeadm_basic/worker_setup.sh b/src/vagrant/kubeadm_basic/worker_setup.sh index 8948ad5..5f34332 100644 --- a/src/vagrant/kubeadm_basic/worker_setup.sh +++ b/src/vagrant/kubeadm_basic/worker_setup.sh @@ -1,4 +1,4 @@ #!/bin/bash set -ex -sudo timeout 3600 kubeadm join --token 8c5adc.1cec8dbf339093f0 192.168.1.10:6443 || true +sudo timeout 600 kubeadm join --token 8c5adc.1cec8dbf339093f0 192.168.1.10:6443 || true diff --git a/src/vagrant/kubeadm_multus/Vagrantfile b/src/vagrant/kubeadm_multus/Vagrantfile index 998edb2..1cc8e58 100644 --- a/src/vagrant/kubeadm_multus/Vagrantfile +++ b/src/vagrant/kubeadm_multus/Vagrantfile @@ -3,7 +3,8 @@ $num_workers=2 Vagrant.require_version ">= 1.8.6" Vagrant.configure("2") do |config| - config.vm.box = "bento/ubuntu-16.04" + 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] @@ -17,16 +18,14 @@ Vagrant.configure("2") do |config| config.vm.define "master" do |config| config.vm.hostname = "master" config.vm.provision "shell", path: "master_setup.sh", privileged: false - config.vm.network :private_network, ip: "10.96.0.10" - config.vm.network :private_network, ip: "10.244.0.10" + config.vm.network :private_network, ip: "192.168.1.10" end (1 .. $num_workers).each do |i| config.vm.define vm_name = "worker%d" % [i] do |config| config.vm.hostname = vm_name config.vm.provision "shell", path: "worker_setup.sh", privileged: false - config.vm.network :private_network, ip: "10.96.0.#{i+20}" - config.vm.network :private_network, ip: "10.244.0.#{i+20}" + config.vm.network :private_network, ip: "192.168.1.#{i+20}" end end diff --git a/src/vagrant/kubeadm_multus/deploy.sh b/src/vagrant/kubeadm_multus/deploy.sh index ae9f798..f5b810e 100755 --- a/src/vagrant/kubeadm_multus/deploy.sh +++ b/src/vagrant/kubeadm_multus/deploy.sh @@ -1,8 +1,8 @@ #!/bin/bash set -ex -HOME="$(dirname `readlink -f $0`)" +DIR="$(dirname `readlink -f $0`)" -cd $HOME +cd $DIR vagrant up vagrant destroy -f diff --git a/src/vagrant/kubeadm_multus/host_setup.sh b/src/vagrant/kubeadm_multus/host_setup.sh index d9b68e2..1aad518 100644 --- a/src/vagrant/kubeadm_multus/host_setup.sh +++ b/src/vagrant/kubeadm_multus/host_setup.sh @@ -3,11 +3,11 @@ set -ex cat << EOF | sudo tee /etc/hosts -1.8.1.0.1 localhost -10.96.0.10 master -10.96.0.21 worker1 -10.96.0.22 worker2 -10.96.0.23 worker3 +127.0.0.1 localhost +192.168.1.10 master +192.168.1.21 worker1 +192.168.1.22 worker2 +192.168.1.23 worker3 EOF curl -s http://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add - diff --git a/src/vagrant/kubeadm_multus/master_setup.sh b/src/vagrant/kubeadm_multus/master_setup.sh index 8170f92..eaf308a 100644 --- a/src/vagrant/kubeadm_multus/master_setup.sh +++ b/src/vagrant/kubeadm_multus/master_setup.sh @@ -2,7 +2,7 @@ set -ex -sudo timeout 3600 kubeadm init --apiserver-advertise-address=10.96.0.10 --service-cidr=10.96.0.0/24 --pod-network-cidr=10.244.0.0/16 --token 8c5adc.1cec8dbf339093f0 +sudo timeout 600 kubeadm init --apiserver-advertise-address=192.168.1.10 --service-cidr=10.96.0.0/24 --pod-network-cidr=10.244.0.0/16 --token 8c5adc.1cec8dbf339093f0 sudo cp /etc/kubernetes/admin.conf $HOME/ sudo chown $(id -u):$(id -g) $HOME/admin.conf export KUBECONFIG=$HOME/admin.conf diff --git a/src/vagrant/kubeadm_multus/worker_setup.sh b/src/vagrant/kubeadm_multus/worker_setup.sh index 19e1051..5f34332 100644 --- a/src/vagrant/kubeadm_multus/worker_setup.sh +++ b/src/vagrant/kubeadm_multus/worker_setup.sh @@ -1,4 +1,4 @@ #!/bin/bash set -ex -sudo timeout 3600 kubeadm join --token 8c5adc.1cec8dbf339093f0 10.96.0.10:6443 || true +sudo timeout 600 kubeadm join --token 8c5adc.1cec8dbf339093f0 192.168.1.10:6443 || true diff --git a/src/vagrant/kubeadm_ovsdpdk/Vagrantfile b/src/vagrant/kubeadm_ovsdpdk/Vagrantfile index dfce7f3..b4f3b0f 100644 --- a/src/vagrant/kubeadm_ovsdpdk/Vagrantfile +++ b/src/vagrant/kubeadm_ovsdpdk/Vagrantfile @@ -3,7 +3,8 @@ $num_workers=2 Vagrant.require_version ">= 1.8.6" Vagrant.configure("2") do |config| - config.vm.box = "bento/ubuntu-16.04" + 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| @@ -19,7 +20,6 @@ Vagrant.configure("2") do |config| config.vm.hostname = "master" config.vm.provision "shell", path: "master_setup.sh", privileged: false config.vm.network :private_network, ip: "192.168.1.10" - config.vm.network :private_network, ip: "10.244.0.10" end (1 .. $num_workers).each do |i| @@ -27,7 +27,6 @@ Vagrant.configure("2") do |config| config.vm.hostname = vm_name config.vm.provision "shell", path: "worker_setup.sh", privileged: false config.vm.network :private_network, ip: "192.168.1.#{i+20}" - config.vm.network :private_network, ip: "10.244.0.#{i+20}" end end diff --git a/src/vagrant/kubeadm_ovsdpdk/deploy.sh b/src/vagrant/kubeadm_ovsdpdk/deploy.sh index ae9f798..f5b810e 100755 --- a/src/vagrant/kubeadm_ovsdpdk/deploy.sh +++ b/src/vagrant/kubeadm_ovsdpdk/deploy.sh @@ -1,8 +1,8 @@ #!/bin/bash set -ex -HOME="$(dirname `readlink -f $0`)" +DIR="$(dirname `readlink -f $0`)" -cd $HOME +cd $DIR vagrant up vagrant destroy -f diff --git a/src/vagrant/kubeadm_ovsdpdk/master_setup.sh b/src/vagrant/kubeadm_ovsdpdk/master_setup.sh index 9bd06f6..28a4c4a 100644 --- a/src/vagrant/kubeadm_ovsdpdk/master_setup.sh +++ b/src/vagrant/kubeadm_ovsdpdk/master_setup.sh @@ -2,7 +2,7 @@ set -ex -sudo timeout 3600 kubeadm init --apiserver-advertise-address 192.168.1.10 --service-cidr=192.168.1.0/24 --pod-network-cidr=10.244.0.0/16 --token 8c5adc.1cec8dbf339093f0 +sudo timeout 600 kubeadm init --apiserver-advertise-address=192.168.1.10 --service-cidr=192.168.1.0/24 --pod-network-cidr=10.244.0.0/16 --token 8c5adc.1cec8dbf339093f0 sudo cp /etc/kubernetes/admin.conf $HOME/ sudo chown $(id -u):$(id -g) $HOME/admin.conf export KUBECONFIG=$HOME/admin.conf diff --git a/src/vagrant/kubeadm_ovsdpdk/worker_setup.sh b/src/vagrant/kubeadm_ovsdpdk/worker_setup.sh index 8948ad5..5f34332 100644 --- a/src/vagrant/kubeadm_ovsdpdk/worker_setup.sh +++ b/src/vagrant/kubeadm_ovsdpdk/worker_setup.sh @@ -1,4 +1,4 @@ #!/bin/bash set -ex -sudo timeout 3600 kubeadm join --token 8c5adc.1cec8dbf339093f0 192.168.1.10:6443 || true +sudo timeout 600 kubeadm join --token 8c5adc.1cec8dbf339093f0 192.168.1.10:6443 || true diff --git a/src/vagrant/kubeadm_virtlet/Vagrantfile b/src/vagrant/kubeadm_virtlet/Vagrantfile index 998edb2..1cc8e58 100644 --- a/src/vagrant/kubeadm_virtlet/Vagrantfile +++ b/src/vagrant/kubeadm_virtlet/Vagrantfile @@ -3,7 +3,8 @@ $num_workers=2 Vagrant.require_version ">= 1.8.6" Vagrant.configure("2") do |config| - config.vm.box = "bento/ubuntu-16.04" + 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] @@ -17,16 +18,14 @@ Vagrant.configure("2") do |config| config.vm.define "master" do |config| config.vm.hostname = "master" config.vm.provision "shell", path: "master_setup.sh", privileged: false - config.vm.network :private_network, ip: "10.96.0.10" - config.vm.network :private_network, ip: "10.244.0.10" + config.vm.network :private_network, ip: "192.168.1.10" end (1 .. $num_workers).each do |i| config.vm.define vm_name = "worker%d" % [i] do |config| config.vm.hostname = vm_name config.vm.provision "shell", path: "worker_setup.sh", privileged: false - config.vm.network :private_network, ip: "10.96.0.#{i+20}" - config.vm.network :private_network, ip: "10.244.0.#{i+20}" + config.vm.network :private_network, ip: "192.168.1.#{i+20}" end end diff --git a/src/vagrant/kubeadm_virtlet/deploy.sh b/src/vagrant/kubeadm_virtlet/deploy.sh index ae9f798..f5b810e 100755 --- a/src/vagrant/kubeadm_virtlet/deploy.sh +++ b/src/vagrant/kubeadm_virtlet/deploy.sh @@ -1,8 +1,8 @@ #!/bin/bash set -ex -HOME="$(dirname `readlink -f $0`)" +DIR="$(dirname `readlink -f $0`)" -cd $HOME +cd $DIR vagrant up vagrant destroy -f diff --git a/src/vagrant/kubeadm_virtlet/host_setup.sh b/src/vagrant/kubeadm_virtlet/host_setup.sh index d9b68e2..1aad518 100644 --- a/src/vagrant/kubeadm_virtlet/host_setup.sh +++ b/src/vagrant/kubeadm_virtlet/host_setup.sh @@ -3,11 +3,11 @@ set -ex cat << EOF | sudo tee /etc/hosts -1.8.1.0.1 localhost -10.96.0.10 master -10.96.0.21 worker1 -10.96.0.22 worker2 -10.96.0.23 worker3 +127.0.0.1 localhost +192.168.1.10 master +192.168.1.21 worker1 +192.168.1.22 worker2 +192.168.1.23 worker3 EOF curl -s http://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add - diff --git a/src/vagrant/kubeadm_virtlet/master_setup.sh b/src/vagrant/kubeadm_virtlet/master_setup.sh index 8831782..ba650ff 100644 --- a/src/vagrant/kubeadm_virtlet/master_setup.sh +++ b/src/vagrant/kubeadm_virtlet/master_setup.sh @@ -2,7 +2,7 @@ set -ex -sudo timeout 3600 kubeadm init --apiserver-advertise-address=10.96.0.10 --service-cidr=10.96.0.0/24 --pod-network-cidr=10.244.0.0/16 --token 8c5adc.1cec8dbf339093f0 +sudo timeout 600 kubeadm init --apiserver-advertise-address=192.168.1.10 --service-cidr=10.96.0.0/24 --pod-network-cidr=10.244.0.0/16 --token 8c5adc.1cec8dbf339093f0 sudo cp /etc/kubernetes/admin.conf $HOME/ sudo chown $(id -u):$(id -g) $HOME/admin.conf export KUBECONFIG=$HOME/admin.conf diff --git a/src/vagrant/kubeadm_virtlet/worker_setup.sh b/src/vagrant/kubeadm_virtlet/worker_setup.sh index b250350..4389770 100644 --- a/src/vagrant/kubeadm_virtlet/worker_setup.sh +++ b/src/vagrant/kubeadm_virtlet/worker_setup.sh @@ -1,8 +1,9 @@ #!/bin/bash set -ex -sudo timeout 3600 kubeadm join --token 8c5adc.1cec8dbf339093f0 10.96.0.10:6443 || true +sudo timeout 600 kubeadm join --token 8c5adc.1cec8dbf339093f0 192.168.1.10:6443 || true +sudo docker pull openretriever/virtlet sudo docker run --rm openretriever/virtlet tar -c /criproxy | sudo tar -C /usr/local/bin -xv sudo ln -s /usr/local/bin/criproxy /usr/local/bin/dockershim -- cgit 1.2.3-korg