summaryrefslogtreecommitdiffstats
path: root/src/vagrant/kubeadm_ovsdpdk
diff options
context:
space:
mode:
Diffstat (limited to 'src/vagrant/kubeadm_ovsdpdk')
-rw-r--r--src/vagrant/kubeadm_ovsdpdk/Vagrantfile5
-rwxr-xr-xsrc/vagrant/kubeadm_ovsdpdk/deploy.sh4
-rw-r--r--src/vagrant/kubeadm_ovsdpdk/master_setup.sh2
-rw-r--r--src/vagrant/kubeadm_ovsdpdk/worker_setup.sh2
4 files changed, 6 insertions, 7 deletions
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