CLOUDSTACK-9339: Leave public interfaces down in backup redundant routers.

Author: dean.close

systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py

@@ -28,7 +28,6 @@
 from CsRule import CsRule
 
 VRRP_TYPES = ['guest']
-PUBLIC_INTERFACE = ['eth1']
 
 class CsAddress(CsDataBag):
 
@@ -321,15 +320,14 @@ def check_is_up(self):
         for i in CsHelper.execute(cmd):
             if " DOWN " in i:
                 cmd2 = "ip link set %s up" % self.getDevice()
-                # If redundant only bring up public interfaces that are not eth1.
-                # Reason: private gateways are public interfaces.
-                # master.py and keepalived will deal with eth1 public interface.
-                if self.cl.is_redundant() and (not self.is_public() or self.getDevice() not in PUBLIC_INTERFACE):
+                # All interfaces should be up on non-redundant or master routers
+                if not self.cl.is_redundant() or self.cl.is_master():
                     CsHelper.execute(cmd2)
-                # if not redundant bring everything up
-                if not self.cl.is_redundant():
+                # only bring up non-public interfaces on backup redundant routers
+                elif not self.is_public():
                     CsHelper.execute(cmd2)
 
+
     def set_mark(self):
         cmd = "-A PREROUTING -i %s -m state --state NEW -j CONNMARK --set-xmark %s/0xffffffff" % \
             (self.getDevice(), self.dnum)