cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sw...@apache.org
Subject [2/2] git commit: updated refs/heads/4.7 to 919660d
Date Thu, 12 May 2016 15:02:44 GMT
Merge pull request #1472 from remibergsma/47_fix_static_router_master_change

Apply static routes on change to master stateRefactored static routes for private gateways
so they also get loaded when the router switches to master state. Otherwise they're lost and
connections drop after fail over.

* pr/1472:
  apply static routes on change to master state

Signed-off-by: Will Stevens <williamstevens@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/919660d0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/919660d0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/919660d0

Branch: refs/heads/4.7
Commit: 919660d093b5ef474dcb6675e08d80b00bc49f82
Parents: 309a60e b9feb39
Author: Will Stevens <williamstevens@gmail.com>
Authored: Thu May 12 11:01:55 2016 -0400
Committer: Will Stevens <williamstevens@gmail.com>
Committed: Thu May 12 11:01:55 2016 -0400

----------------------------------------------------------------------
 .../debian/config/opt/cloud/bin/configure.py    | 22 +---------
 .../config/opt/cloud/bin/cs/CsRedundant.py      | 10 +++--
 .../config/opt/cloud/bin/cs/CsStaticRoutes.py   | 42 ++++++++++++++++++++
 3 files changed, 50 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/919660d0/systemvm/patches/debian/config/opt/cloud/bin/configure.py
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/919660d0/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py
----------------------------------------------------------------------
diff --cc systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py
index 7cc72d8,3434611..f1ab5f7
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsRedundant.py
@@@ -296,16 -292,16 +297,16 @@@ class CsRedundant(object)
          logging.debug("Setting router to master")
  
          dev = ''
 -        ips = [ip for ip in self.address.get_ips() if ip.is_public()]
 +        interfaces = [interface for interface in self.address.get_interfaces() if interface.is_public()]
          route = CsRoute()
 -        for ip in ips:
 -            if dev == ip.get_device():
 +        for interface in interfaces:
 +            if dev == interface.get_device():
                  continue
 -            dev = ip.get_device()
 +            dev = interface.get_device()
              logging.info("Will proceed configuring device ==> %s" % dev)
-             cmd2 = "ip link set %s up" % dev
+             cmd = "ip link set %s up" % dev
              if CsDevice(dev, self.config).waitfordevice():
-                 CsHelper.execute(cmd2)
+                 CsHelper.execute(cmd)
                  logging.info("Bringing public interface %s up" % dev)
  
                  try:


Mime
View raw message