Revision 4ca52046

b/lib/cmdlib.py
4068 4068
    self.old_flags = old_flags = (node.master_candidate,
4069 4069
                                  node.drained, node.offline)
4070 4070
    assert old_flags in self._F2R, "Un-handled old flags  %s" % str(old_flags)
4071
    self.old_role = self._F2R[old_flags]
4071
    self.old_role = old_role = self._F2R[old_flags]
4072 4072

  
4073 4073
    # Check for ineffective changes
4074 4074
    for attr in self._FLAGS:
......
4091 4091
      self.LogInfo("Demoting from master candidate")
4092 4092
      self.op.master_candidate = False
4093 4093

  
4094
  def Exec(self, feedback_fn):
4095
    """Modifies a node.
4096

  
4097
    """
4098
    node = self.node
4099
    old_role = self.old_role
4100

  
4094
    # Compute new role
4101 4095
    assert [getattr(self.op, attr) for attr in self._FLAGS].count(True) <= 1
4102

  
4103
    # compute new flags
4104 4096
    if self.op.master_candidate:
4105 4097
      new_role = self._ROLE_CANDIDATE
4106 4098
    elif self.op.drained:
......
4114 4106
    else: # no new flags, nothing, keep old role
4115 4107
      new_role = old_role
4116 4108

  
4109
    self.new_role = new_role
4110

  
4111
  def Exec(self, feedback_fn):
4112
    """Modifies a node.
4113

  
4114
    """
4115
    node = self.node
4116
    old_role = self.old_role
4117
    new_role = self.new_role
4118

  
4117 4119
    result = []
4118 4120

  
4119 4121
    for attr in ["master_capable", "vm_capable"]:

Also available in: Unified diff