summaryrefslogtreecommitdiffstats
path: root/src/vagrant/kubeadm_multus
diff options
context:
space:
mode:
authorXuan Jia <jason.jiaxuan@gmail.com>2017-11-25 02:37:06 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-11-25 02:37:06 +0000
commitb80a6c9558a472fad77ef0aadca201f38cfcc841 (patch)
treefa19610bf8b79d5dbd4d750be505adaca9368264 /src/vagrant/kubeadm_multus
parent07b792f6cbf6e583cb4b5e78c5502201ed61025a (diff)
parent410039d2e60e8e00cc9544ab086388b8ffc699f3 (diff)
Merge "remove timemout for k8s installation"
Diffstat (limited to 'src/vagrant/kubeadm_multus')
-rw-r--r--src/vagrant/kubeadm_multus/master_setup.sh2
-rw-r--r--src/vagrant/kubeadm_multus/worker_setup.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/vagrant/kubeadm_multus/master_setup.sh b/src/vagrant/kubeadm_multus/master_setup.sh
index ac85347..395868f 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 600 kubeadm init --apiserver-advertise-address=192.168.1.10 --service-cidr=10.96.0.0/16 --pod-network-cidr=10.32.0.0/12 --token 8c5adc.1cec8dbf339093f0
+sudo kubeadm init --apiserver-advertise-address=192.168.1.10 --service-cidr=10.96.0.0/16 --pod-network-cidr=10.32.0.0/12 --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 5f34332..b68d800 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 600 kubeadm join --token 8c5adc.1cec8dbf339093f0 192.168.1.10:6443 || true
+sudo kubeadm join --token 8c5adc.1cec8dbf339093f0 192.168.1.10:6443 || true