Revision 90d118fd

b/lib/objects.py
383 383
        self.nicparams[constants.NIC_MODE] = constants.NIC_MODE_BRIDGED
384 384
        self.nicparams[constants.NIC_LINK] = self.bridge
385 385
    # bridge is no longer used it 2.1. The slot is left there to support
386
    # upgrading, but will be removed in 2.2
386
    # upgrading, but can be removed once upgrades to the current version
387
    # straight from 2.0 are deprecated.
387 388
    if self.bridge is not None:
388 389
      self.bridge = None
389 390

  
......
917 918
      self.modify_ssh_setup = True
918 919

  
919 920
    # default_bridge is no longer used it 2.1. The slot is left there to
920
    # support auto-upgrading, but will be removed in 2.2
921
    # support auto-upgrading. It can be removed once we decide to deprecate
922
    # upgrading straight from 2.0.
921 923
    if self.default_bridge is not None:
922 924
      self.default_bridge = None
923 925

  
924
    # default_hypervisor is just the first enabled one in 2.1
926
    # default_hypervisor is just the first enabled one in 2.1. This slot and
927
    # code can be removed once upgrading straight from 2.0 is deprecated.
925 928
    if self.default_hypervisor is not None:
926 929
      self.enabled_hypervisors = ([self.default_hypervisor] +
927 930
        [hvname for hvname in self.enabled_hypervisors

Also available in: Unified diff