cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [01/12] git commit: updated refs/heads/master to ca9e934
Date Thu, 08 Oct 2015 23:49:24 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 99059e221 -> ca9e934e9


CLOUDSTACK-8915 - Add the default route only on address that have not been configured yet.

   - In case of rVPC we experienced the wrong route being added to the VPC tiers


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

Branch: refs/heads/master
Commit: c17fb0ff2829b3db4826954970427916df633434
Parents: 99059e2
Author: Wilder Rodrigues <wrodrigues@schubergphilis.com>
Authored: Mon Sep 28 13:15:54 2015 +0200
Committer: Wilder Rodrigues <wrodrigues@schubergphilis.com>
Committed: Tue Oct 6 16:41:12 2015 +0200

----------------------------------------------------------------------
 .../debian/config/opt/cloud/bin/cs/CsAddress.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c17fb0ff/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
index e3fa1bc..3e8fbca 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/cs/CsAddress.py
@@ -142,16 +142,16 @@ class CsAddress(CsDataBag):
                         "Address %s on device %s not configured", ip.ip(), dev)
                     if CsDevice(dev, self.config).waitfordevice():
                         ip.configure()
-
-                route.add_route(dev, network)
-
-                # The code looks redundant here, but we actually have to cater for routers
and
-                # VPC routers in a different manner. Please do not remove this block otherwise
-                # The VPC default route will be broken.
-                if address["nw_type"] == "public" and not found_defaultroute:
-                    if not route.defaultroute_exists():
-                        if route.add_defaultroute(gateway):
-                            found_defaultroute = True
+                        
+                        route.add_route(dev, network)
+
+                        # The code looks redundant here, but we actually have to cater for
routers and
+                        # VPC routers in a different manner. Please do not remove this block
otherwise
+                        # The VPC default route will be broken.
+                        if address["nw_type"] == "public" and not found_defaultroute:
+                            if not route.defaultroute_exists():
+                                if route.add_defaultroute(gateway):
+                                    found_defaultroute = True
 
         # once we start processing public ip's we need to verify there
         # is a default route and add if needed


Mime
View raw message