Revision 08eec276 lib/cmdlib.py

b/lib/cmdlib.py
4587 4587
    This runs on master, primary and secondary nodes of the instance.
4588 4588

  
4589 4589
    """
4590
    instance = self.instance
4591
    source_node = instance.primary_node
4592
    target_node = instance.secondary_nodes[0]
4590 4593
    env = {
4591 4594
      "IGNORE_CONSISTENCY": self.op.ignore_consistency,
4592 4595
      "SHUTDOWN_TIMEOUT": self.shutdown_timeout,
4596
      "OLD_PRIMARY": source_node,
4597
      "OLD_SECONDARY": target_node,
4598
      "NEW_PRIMARY": target_node,
4599
      "NEW_SECONDARY": source_node,
4593 4600
      }
4594
    env.update(_BuildInstanceHookEnvByObject(self, self.instance))
4595
    nl = [self.cfg.GetMasterNode()] + list(self.instance.secondary_nodes)
4601
    env.update(_BuildInstanceHookEnvByObject(self, instance))
4602
    nl = [self.cfg.GetMasterNode()] + list(instance.secondary_nodes)
4596 4603
    return env, nl, nl
4597 4604

  
4598 4605
  def CheckPrereq(self):
......
4735 4742

  
4736 4743
    """
4737 4744
    instance = self._migrater.instance
4745
    source_node = instance.primary_node
4746
    target_node = instance.secondary_nodes[0]
4738 4747
    env = _BuildInstanceHookEnvByObject(self, instance)
4739 4748
    env["MIGRATE_LIVE"] = self.op.live
4740 4749
    env["MIGRATE_CLEANUP"] = self.op.cleanup
4750
    env.update({
4751
        "OLD_PRIMARY": source_node,
4752
        "OLD_SECONDARY": target_node,
4753
        "NEW_PRIMARY": target_node,
4754
        "NEW_SECONDARY": source_node,
4755
        })
4741 4756
    nl = [self.cfg.GetMasterNode()] + list(instance.secondary_nodes)
4742 4757
    return env, nl, nl
4743 4758

  

Also available in: Unified diff