Merge "No need to specify HWADDR in the vlan interface configuration …

…file. It dynamically gets it from the parent interface." into R3.0
Juniper · Jul 6, 2016 · ae9236d · ae9236d
2 parents 1f5b73b + 917ab23
commit ae9236d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/contrail_provisioning/common/interface_setup.py b/contrail_provisioning/common/interface_setup.py
@@ -185,12 +185,15 @@ def create_bonding_interface(self):
         # create slave interface
         self.get_mac_from_bond_intf()
         self.create_bond_members()
-        log.info('Creating bond master: %s' %self.device)
+        bond_mac = self.get_mac_addr(self.members[0])
+        log.info('Creating bond master: %s with Mac Addr: %s' %
+                (self.device, bond_mac))
         cfg = {'DEVICE'        : self.device,
                'ONBOOT'        : 'yes',
                'BOOTPROTO'     : 'none',
                'NM_CONTROLLED' : 'no',
                'BONDING_MASTER': 'yes',
+               'MACADDR'        : bond_mac,
                'BONDING_OPTS'  : "\"%s\""%self.bond_opts_str.strip(),
                'SUBCHANNELS'   : '1,2,3'
               }

diff --git a/contrail_provisioning/compute/network.py b/contrail_provisioning/compute/network.py
@@ -176,7 +176,7 @@ def _rewrite_ifcfg_file(self, filename, dev, prsv_cfg):
         new_f_lines.append('NM_CONTROLLED=no\n')
         if bond:
             new_f_lines.append('SUBCHANNELS=1,2,3\n')
-        else:
+        elif not vlan:
             new_f_lines.append('HWADDR=%s\n' % mac)
 
         fdw=open(filename,'w')