From 3c8655e829a125be806c101f419728e6cb2cf35d Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 4 Jul 2019 07:24:55 +0000 Subject: [PATCH 1/2] vr: Fix vpc router in UNKNOWN state If there are more than 10 vpc tiers or public ip subnets in a VPC, eth1X will be added in vpc router. The redundant state is UNKNOWN in this case. --- systemvm/debian/opt/cloud/bin/checkrouter.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/systemvm/debian/opt/cloud/bin/checkrouter.sh b/systemvm/debian/opt/cloud/bin/checkrouter.sh index bb6c9f8a0f23..3a760cb5d7f1 100755 --- a/systemvm/debian/opt/cloud/bin/checkrouter.sh +++ b/systemvm/debian/opt/cloud/bin/checkrouter.sh @@ -27,10 +27,10 @@ fi ROUTER_TYPE=$(cat /etc/cloudstack/cmdline.json | grep type | awk '{print $2;}' | sed -e 's/[,\"]//g') if [ "$ROUTER_TYPE" = "router" ] then - ROUTER_STATE=$(ip addr | grep eth0 | grep inet | wc -l | xargs bash -c 'if [ $0 == 2 ]; then echo "MASTER"; else echo "BACKUP"; fi') + ROUTER_STATE=$(ip addr | grep -w eth0 | grep inet | wc -l | xargs bash -c 'if [ $0 == 2 ]; then echo "MASTER"; else echo "BACKUP"; fi') STATUS=$ROUTER_STATE else - ROUTER_STATE=$(ip addr | grep eth1 | grep state | awk '{print $9;}') + ROUTER_STATE=$(ip addr | grep -w eth1 | grep state | awk '{print $9;}') if [ "$ROUTER_STATE" = "UP" ] then STATUS=MASTER From 561cf1fc7bbbf7f7e941a284130a32657cbc1551 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Wed, 10 Jul 2019 12:03:38 +0530 Subject: [PATCH 2/2] Use ip addr show dev syntax --- systemvm/debian/opt/cloud/bin/checkrouter.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/systemvm/debian/opt/cloud/bin/checkrouter.sh b/systemvm/debian/opt/cloud/bin/checkrouter.sh index 3a760cb5d7f1..c0d2ea770190 100755 --- a/systemvm/debian/opt/cloud/bin/checkrouter.sh +++ b/systemvm/debian/opt/cloud/bin/checkrouter.sh @@ -27,10 +27,10 @@ fi ROUTER_TYPE=$(cat /etc/cloudstack/cmdline.json | grep type | awk '{print $2;}' | sed -e 's/[,\"]//g') if [ "$ROUTER_TYPE" = "router" ] then - ROUTER_STATE=$(ip addr | grep -w eth0 | grep inet | wc -l | xargs bash -c 'if [ $0 == 2 ]; then echo "MASTER"; else echo "BACKUP"; fi') + ROUTER_STATE=$(ip addr show dev eth0 | grep inet | wc -l | xargs bash -c 'if [ $0 == 2 ]; then echo "MASTER"; else echo "BACKUP"; fi') STATUS=$ROUTER_STATE else - ROUTER_STATE=$(ip addr | grep -w eth1 | grep state | awk '{print $9;}') + ROUTER_STATE=$(ip addr show dev eth1 | grep state | awk '{print $9;}') if [ "$ROUTER_STATE" = "UP" ] then STATUS=MASTER