Revision 9b31ca85

b/lib/objects.py
339 339
      if self.bridge is not None:
340 340
        self.nicparams[constants.NIC_MODE] = constants.NIC_MODE_BRIDGED
341 341
        self.nicparams[constants.NIC_LINK] = self.bridge
342
    # bridge is no longer used it 2.1. The slot is left there to support
343
    # upgrading, but will be removed in 2.2
344
    if self.bridge is not None:
345
      self.bridge = None
342 346

  
343 347

  
344 348
class Disk(ConfigObject):
......
822 826
    if self.modify_etc_hosts is None:
823 827
      self.modify_etc_hosts = True
824 828

  
829
    # default_bridge is no longer used it 2.1. The slot is left there to
830
    # support auto-upgrading, but will be removed in 2.2
831
    if self.default_bridge is not None:
832
      self.default_bridge = None
833

  
825 834
  def ToDict(self):
826 835
    """Custom function for cluster.
827 836

  

Also available in: Unified diff