From f81a29351d2c20714db1220c32fee4cdff61ed3b Mon Sep 17 00:00:00 2001
From: Wilder Rodrigues <wrodrigues@schubergphilis.com>
Date: Mon, 7 Dec 2015 19:18:20 +0100
Subject: [PATCH] CLOUDSTACK-9118 - Improves the existing checkrouter.sh script

---
 .../config/opt/cloud/bin/checkrouter.sh       | 20 ++++++++++---------
 .../opt/cloud/templates/checkrouter.sh.templ  | 20 ++++++++++---------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh b/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh
index f05b440e74b..0ba0ee5013b 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh
+++ b/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh
@@ -21,15 +21,17 @@ INTERFACE=eth1
 ROUTER_TYPE=$(cat /etc/cloudstack/cmdline.json | grep type | awk '{print $2;}' | sed -e 's/[,\"]//g')
 if [ $ROUTER_TYPE = "router" ]
 then
-    INTERFACE=eth2
+	ROUTER_STATE=$(ip addr | grep 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 $INTERFACE | grep state | awk '{print $9;}')
+	if [ $ROUTER_STATE = "UP" ]
+	then
+	    STATUS=MASTER
+	elif [ $ROUTER_STATE = "DOWN" ]
+	then
+	    STATUS=BACKUP
+	fi
 fi
 
-ETH1_STATE=$(ip addr | grep $INTERFACE | grep state | awk '{print $9;}')
-if [ $ETH1_STATE = "UP" ]
-then
-    STATUS=MASTER
-elif [ $ETH1_STATE = "DOWN" ]
-then
-    STATUS=BACKUP
-fi
 echo "Status: ${STATUS}"
\ No newline at end of file
diff --git a/systemvm/patches/debian/config/opt/cloud/templates/checkrouter.sh.templ b/systemvm/patches/debian/config/opt/cloud/templates/checkrouter.sh.templ
index f05b440e74b..0ba0ee5013b 100755
--- a/systemvm/patches/debian/config/opt/cloud/templates/checkrouter.sh.templ
+++ b/systemvm/patches/debian/config/opt/cloud/templates/checkrouter.sh.templ
@@ -21,15 +21,17 @@ INTERFACE=eth1
 ROUTER_TYPE=$(cat /etc/cloudstack/cmdline.json | grep type | awk '{print $2;}' | sed -e 's/[,\"]//g')
 if [ $ROUTER_TYPE = "router" ]
 then
-    INTERFACE=eth2
+	ROUTER_STATE=$(ip addr | grep 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 $INTERFACE | grep state | awk '{print $9;}')
+	if [ $ROUTER_STATE = "UP" ]
+	then
+	    STATUS=MASTER
+	elif [ $ROUTER_STATE = "DOWN" ]
+	then
+	    STATUS=BACKUP
+	fi
 fi
 
-ETH1_STATE=$(ip addr | grep $INTERFACE | grep state | awk '{print $9;}')
-if [ $ETH1_STATE = "UP" ]
-then
-    STATUS=MASTER
-elif [ $ETH1_STATE = "DOWN" ]
-then
-    STATUS=BACKUP
-fi
 echo "Status: ${STATUS}"
\ No newline at end of file