diff options
| author |   Xuan Jia <jason.jiaxuan@gmail.com> | 2017-08-16 06:07:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-16 06:07:14 +0000 |
| commit | 08db604ab4a7c865547d86549589cdb20cd25228 (patch) | |
| tree | b44acf32bc4aee60a1f379b624f1e7d1d962e39b /src/vagrant/k8s_kubeadm/master_setup.sh | |
| parent | dbf294252cc8b418d920dcd94749630d741c8bb9 (diff) | |
| parent | da51aabb3171afb8107f837fd0ccfe1add403c4d (diff) | |
Merge "Fix some issues in ovsdpdk, cni for ovsdpdk"
Diffstat (limited to 'src/vagrant/k8s_kubeadm/master_setup.sh')
| -rw-r--r-- | src/vagrant/k8s_kubeadm/master_setup.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/vagrant/k8s_kubeadm/master_setup.sh b/src/vagrant/k8s_kubeadm/master_setup.sh index e98e2bb..06785b6 100644 --- a/src/vagrant/k8s_kubeadm/master_setup.sh +++ b/src/vagrant/k8s_kubeadm/master_setup.sh @@ -8,8 +8,8 @@ sudo chown $(id -u):$(id -g) $HOME/admin.conf export KUBECONFIG=$HOME/admin.conf echo "export KUBECONFIG=$HOME/admin.conf" >> $HOME/.bash_profile -kubectl apply -f http://git.io/weave-kube-1.6 +#kubectl apply -f http://git.io/weave-kube-1.6 #kubectl apply -f http://raw.githubusercontent.com/coreos/flannel/master/Documentation/kube-flannel.yml #kubectl apply -f http://docs.projectcalico.org/v2.1/getting-started/kubernetes/installation/hosted/kubeadm/1.6/calico.yaml -#kubectl apply -f /vagrant/k8s_kubeadm/dpdk/kube_ovsdpdk.yml -#kubectl apply -f /src/cni/ovsdpdk/kube_ovsdpdk.yml +kubectl apply -f /vagrant/ovsdpdk/kube_ovsdpdk.yml +kubectl apply -f /src/cni/ovsdpdk/kube_cniovsdpdk.yml |