diff --git a/cicd/common.sh b/cicd/common.sh index 47923f1ca..974d57bce 100644 --- a/cicd/common.sh +++ b/cicd/common.sh @@ -156,7 +156,7 @@ get_llb_peerIP() { llb2IP="$A.$B.$C.$((D+1))" fi cluster_opts=" --cluster=$llb2IP --self=0" - ka_opts=" --ka=$llb2IP" + ka_opts=" --ka=$llb2IP:$llb1IP" elif [[ "$1" == "llb2" ]]; then llb2IP=$(docker inspect --format='{{.NetworkSettings.IPAddress}}' llb2) if [[ "lb$llb2IP" == "lb" ]];then @@ -166,7 +166,7 @@ get_llb_peerIP() { llb1IP="$A.$B.$C.$((D-1))" fi cluster_opts=" --cluster=$llb1IP --self=1" - ka_opts=" --ka=$llb1IP" + ka_opts=" --ka=$llb1IP:$llb2IP" fi } diff --git a/cicd/k3s-flannel/validation.sh b/cicd/k3s-flannel/validation.sh index 4d7f49445..3b800ce20 100755 --- a/cicd/k3s-flannel/validation.sh +++ b/cicd/k3s-flannel/validation.sh @@ -28,7 +28,7 @@ do done ## Any routing updates ?? -sleep 30 +sleep 60 echo "ExternalIP $extIP" @@ -45,6 +45,8 @@ print_debug_info() { $dexec llb1 loxicmd get ep -o wide echo "**** llb1 route-info ****" $dexec llb1 ip route + echo "**** llb1 bfd-info ****" + $dexec llb1 loxicmd get ha echo "**** llb2 lb-info ****" $dexec llb2 loxicmd get lb -o wide @@ -52,13 +54,20 @@ print_debug_info() { $dexec llb1 loxicmd get ep -o wide echo "**** llb2 route-info ****" $dexec llb2 ip route + echo "**** llb2 bfd-info ****" + $dexec llb2 loxicmd get ha echo "**** r1 route-info ****" $dexec r1 ip route + + echo "**** sys route-info ****" + ip route } code=0 -#print_debug_info +echo "********************" +print_debug_info +echo "********************" out=$($hexec user curl -s --connect-timeout 10 http://$extIP:55002) if [[ ${out} == *"Welcome to nginx"* ]]; then