addons: bond: enable ipv6 on brports before bond enslaving

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>

diff --git a/ifupdown2/addons/bond.py b/ifupdown2/addons/bond.py
index 467c8ba07e1de62355dc1fa66b4de6aae7a961d3..72096b3617093d0e2775cda33149113f83b9f507 100644 (file)
--- a/ifupdown2/addons/bond.py
+++ b/ifupdown2/addons/bond.py
@@ -259,6 +259,16 @@ class bond(moduleBase):
         else:
             return None
 
+    def enable_ipv6_if_prev_brport(self, ifname):
+        """
+        If the intf was previously enslaved to a bridge it is possible ipv6 is still disabled.
+        """
+        try:
+            if os.path.exists("/sys/class/net/%s/brport" % ifname):
+                self.write_file("/proc/sys/net/ipv6/conf/%s/disable_ipv6" % ifname, "0")
+        except Exception, e:
+            self.logger.info(str(e))
+
     def _is_clag_bond(self, ifaceobj):
         if self.get_bond_slaves(ifaceobj):
             attrval = ifaceobj.get_attr_value_first('clag-id')
@@ -297,6 +307,7 @@ class bond(moduleBase):
                     netlink.link_set_protodown(slave, "on")
                 except Exception, e:
                     self.logger.error('%s: %s' % (ifaceobj.name, str(e)))
+            self.enable_ipv6_if_prev_brport(slave)
             netlink.link_set_master(slave, ifaceobj.name)
             if link_up or ifaceobj.link_type != ifaceLinkType.LINK_NA:
                try: