Code Review
/
iec.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Integrate the VM deployment tools into IEC"
[iec.git]
/
src
/
foundation
/
scripts
/
startup.sh
diff --git
a/src/foundation/scripts/startup.sh
b/src/foundation/scripts/startup.sh
index
dad6728
..
01783bc
100755
(executable)
--- a/
src/foundation/scripts/startup.sh
+++ b/
src/foundation/scripts/startup.sh
@@
-64,9
+64,9
@@
deploy_k8s () {
#Deploy etcd & CNI from master node
#There may be more options in future. e.g: Calico, Contiv-vpp, Ovn-k8s ...
#Deploy etcd & CNI from master node
#There may be more options in future. e.g: Calico, Contiv-vpp, Ovn-k8s ...
- SETUP_CNI="
KUBECONFIG=/etc/kubernetes/admin.conf &&
cd iec/src/foundation/scripts && source setup-cni.sh"
+ SETUP_CNI="cd iec/src/foundation/scripts && source setup-cni.sh"
sshpass -p ${K8S_MASTERPW} ssh -o StrictHostKeyChecking=no ${HOST_USER}@${K8S_MASTER_IP} ${SETUP_CNI}
sshpass -p ${K8S_MASTERPW} ssh -o StrictHostKeyChecking=no ${HOST_USER}@${K8S_MASTER_IP} ${SETUP_CNI}
- SETUP_HELM="
KUBECONFIG=/etc/kubernetes/admin.conf &&
cd iec/src/foundation/scripts && source helm.sh"
+ SETUP_HELM="cd iec/src/foundation/scripts && source helm.sh"
sshpass -p ${K8S_MASTERPW} ssh -o StrictHostKeyChecking=no ${HOST_USER}@${K8S_MASTER_IP} ${SETUP_HELM}
}
sshpass -p ${K8S_MASTERPW} ssh -o StrictHostKeyChecking=no ${HOST_USER}@${K8S_MASTER_IP} ${SETUP_HELM}
}