From 2a747ca73538325fb24b3eefb95197bc1f8c6222 Mon Sep 17 00:00:00 2001 From: Wilder Rodrigues Date: Sat, 17 Oct 2015 12:09:26 +0200 Subject: [PATCH] CLOUDSTACK-8952 - Reduce retried from 20 to 5 - We do not need to retry that much --- systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh | 2 +- .../debian/config/opt/cloud/templates/checkrouter.sh.templ | 2 +- test/integration/component/test_vpc_redundant.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh b/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh index 1e4335c0fcc..9579b119cc1 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh +++ b/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh @@ -20,6 +20,6 @@ STATUS=BACKUP ETH1_STATE=$(ip addr | grep eth1 | grep state | awk '{print $9;}') if [ $ETH1_STATE = "UP" ] then - STATUS=MASTER + STATUS=MASTER 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 1e4335c0fcc..9579b119cc1 100755 --- a/systemvm/patches/debian/config/opt/cloud/templates/checkrouter.sh.templ +++ b/systemvm/patches/debian/config/opt/cloud/templates/checkrouter.sh.templ @@ -20,6 +20,6 @@ STATUS=BACKUP ETH1_STATE=$(ip addr | grep eth1 | grep state | awk '{print $9;}') if [ $ETH1_STATE = "UP" ] then - STATUS=MASTER + STATUS=MASTER fi echo "Status: ${STATUS}" \ No newline at end of file diff --git a/test/integration/component/test_vpc_redundant.py b/test/integration/component/test_vpc_redundant.py index dfbf574cab2..a6032a1b3f6 100644 --- a/test/integration/component/test_vpc_redundant.py +++ b/test/integration/component/test_vpc_redundant.py @@ -555,7 +555,7 @@ class TestVPCRedundancy(cloudstackTestCase): time.sleep(5) def do_vpc_test(self, expectFail): - retries = 20 + retries = 5 if expectFail: retries = 2 for o in self.networks: