X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=src%2Ffoundation%2Fscripts%2Fsetup-cni.sh;h=fb02ff367e97d90721b3a55481e1933f51097a3e;hb=3fede757f11222d4a62f24cc1051c75c0bffbc64;hp=b383b97cc47243eefed42f002b71dd345d343fc6;hpb=37289e2600c2c312113b20b6afcd69221703bc50;p=iec.git

diff --git a/src/foundation/scripts/setup-cni.sh b/src/foundation/scripts/setup-cni.sh
index b383b97..fb02ff3 100755
--- a/src/foundation/scripts/setup-cni.sh
+++ b/src/foundation/scripts/setup-cni.sh
@@ -11,6 +11,9 @@ fi
 CLUSTER_IP=${1:-172.16.1.136} # Align with the value in our K8s setup script
 POD_NETWORK_CIDR=${2:-192.168.0.0/16}
 CNI_TYPE=${3:-calico}
+K8S_MASTER_IP=${4:-10.169.41.173}
+SERVICE_CIDR=${5:-172.16.1.0/24}
+DEV_NAME=${6:-}
 
 SCRIPTS_DIR=$(dirname "${BASH_SOURCE[0]}")
 
@@ -36,11 +39,43 @@ install_flannel(){
   kubectl apply -f "${SCRIPTS_DIR}/cni/flannel/kube-flannel.yml"
 }
 
-install_contiv(){
-  # Install the Contiv-vpp
-  echo "World peach!!!!!!!!!!!!!!"
+install_contivpp(){
+  # Update vpp config file
+  ${SCRIPTS_DIR}/cni/contivpp/contiv-update-config.sh $DEV_NAME
+
+  # Install contivpp CNI
+  sed -i "s@10.1.0.0/16@${POD_NETWORK_CIDR}@" "${SCRIPTS_DIR}/cni/contivpp/contiv-vpp.yaml"
+  kubectl apply -f "${SCRIPTS_DIR}/cni/contivpp/contiv-vpp.yaml"
+}
+
+install_ovn_kubernetes(){
+  # Update the ovn-kubernetes yaml files
+
+  net_cidr_repl="{{ net_cidr | default('10.128.0.0/14/23') }}"
+  svc_cidr_repl="{{ svc_cidr | default('172.30.0.0/16') }}"
+  k8s_apiserver_repl="{{ k8s_apiserver.stdout }}"
+
+  k8s_apiserver="https://${K8S_MASTER_IP}:6443"
+  net_cidr="${POD_NETWORK_CIDR}"
+  svc_cidr="${SERVICE_CIDR}"
+
+  echo "net_cidr: ${net_cidr}"
+  echo "svc_cidr: ${svc_cidr}"
+  echo "k8s_apiserver: ${k8s_apiserver}"
+
+  sed "s,${net_cidr_repl},${net_cidr},
+  s,${svc_cidr_repl},${svc_cidr},
+  s,${k8s_apiserver_repl},${k8s_apiserver}," \
+  ${SCRIPTS_DIR}/cni/ovn-kubernetes/templates/ovn-setup.yaml.j2 > \
+  ${SCRIPTS_DIR}/cni/ovn-kubernetes/yaml/ovn-setup.yaml
+
+  # Install ovn-kubernetes by yaml files
+  # shellcheck source=/dev/null
+  source ${SCRIPTS_DIR}/cni/ovn-kubernetes/install-ovn-k8s.sh
+
 }
 
+
 case ${CNI_TYPE} in
  'calico')
         echo "Install calico ..."
@@ -50,12 +85,16 @@ case ${CNI_TYPE} in
         echo "Install flannel ..."
         install_flannel
         ;;
- 'contivvpp')
-        echo "Install Contiv-vpp ..."
-        install_contiv
+ 'contivpp')
+        echo "Install Contiv-VPP ..."
+        install_contivpp
+        ;;
+ 'ovn-kubernetes')
+        echo "Install Ovn-Kubernetes ..."
+        install_ovn_kubernetes
         ;;
  *)
-        echo "${CNI_TYPE} does not supportted"
+        echo "${CNI_TYPE} is not supported"
         exit 1
         ;;
 esac