X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=src%2Ffoundation%2Fscripts%2Fsetup-cni.sh;h=d1b27bcf097485089ad13f3e20948dbf8f6a7e09;hb=69177e641b600de94225403909519923a33d3c0e;hp=b383b97cc47243eefed42f002b71dd345d343fc6;hpb=797906714f9093f707ff847ac1e5225a47013c5c;p=iec.git

diff --git a/src/foundation/scripts/setup-cni.sh b/src/foundation/scripts/setup-cni.sh
index b383b97..d1b27bc 100755
--- a/src/foundation/scripts/setup-cni.sh
+++ b/src/foundation/scripts/setup-cni.sh
@@ -11,6 +11,7 @@ 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}
+DEV_NAME=${4:-}
 
 SCRIPTS_DIR=$(dirname "${BASH_SOURCE[0]}")
 
@@ -36,9 +37,13 @@ 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"
 }
 
 case ${CNI_TYPE} in
@@ -50,12 +55,12 @@ case ${CNI_TYPE} in
         echo "Install flannel ..."
         install_flannel
         ;;
- 'contivvpp')
-        echo "Install Contiv-vpp ..."
-        install_contiv
+ 'contivpp')
+        echo "Install Contiv-VPP ..."
+        install_contivpp
         ;;
  *)
-        echo "${CNI_TYPE} does not supportted"
+        echo "${CNI_TYPE} is not supported"
         exit 1
         ;;
 esac