X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=src%2Ffoundation%2Fscripts%2Fstartup.sh;h=3b8525b274b06156f33618d5892f975aeba97f76;hb=55fbf4451a30337c7db112433126c07c091dbc07;hp=4cc66f5abbc42b566aff9238d8de15561c4fc996;hpb=abc65c4c633ff0dae5ae8ba801f96ca80db903d7;p=iec.git diff --git a/src/foundation/scripts/startup.sh b/src/foundation/scripts/startup.sh index 4cc66f5..3b8525b 100755 --- a/src/foundation/scripts/startup.sh +++ b/src/foundation/scripts/startup.sh @@ -1,4 +1,5 @@ #!/bin/bash +# shellcheck disable=SC1073,SC1072,SC1039,SC2059,SC2046 #Install the k8s-master & k8s-worker node from Mgnt node # set -e @@ -53,6 +54,10 @@ case ${CNI_TYPE} in CILIUM_CONFIG="cd iec/src/foundation/scripts/cni/cilium && sudo ./cilium_install.sh" sshpass -p ${passwd} ssh -o StrictHostKeyChecking=no ${HOST_USER}@${ip_addr} $CILIUM_CONFIG ;; + ovn-kubernetes) + OVN_KUBERNETES_PRECONFIG="cd iec/src/foundation/scripts/cni/ovn-kubernetes && ./clean_old_ovs.sh" + sshpass -p ${passwd} ssh -o StrictHostKeyChecking=no ${HOST_USER}@${ip_addr} $OVN_KUBERNETES_PRECONFIG + ;; *) ;; esac @@ -102,7 +107,7 @@ deploy_k8s () { #Deploy etcd & CNI from master node - SETUP_CNI="cd iec/src/foundation/scripts && source setup-cni.sh $CNI_TYPE $POD_NETWORK_CIDR $CLUSTER_IP $K8S_MASTER_IP $SVC_CIDR" + SETUP_CNI="cd iec/src/foundation/scripts && source setup-cni.sh $CNI_TYPE $POD_NETWORK_CIDR $K8S_MASTER_IP $SVC_CIDR $CLUSTER_IP" sshpass -p ${K8S_MASTERPW} ssh -o StrictHostKeyChecking=no ${HOST_USER}@${K8S_MASTER_IP} ${SETUP_CNI} 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}