Revision 3360026f lib/cmdlib/instance.py

b/lib/cmdlib/instance.py
38 38
from ganeti import objects
39 39
from ganeti import pathutils
40 40
from ganeti import serializer
41
from ganeti import ssh
42 41
import ganeti.rpc.node as rpc
43 42
from ganeti import utils
44 43

  
......
1492 1491
    disk_abort = False
1493 1492

  
1494 1493
    if not self.adopt_disks and os_image is not None:
1495
      master = self.cfg.GetMasterNode()
1496

  
1497
      if not utils.IsUrl(os_image) and master != self.pnode.uuid:
1498
        ssh_port = self.pnode.ndparams.get(constants.ND_SSH_PORT)
1499
        srun = ssh.SshRunner(self.cfg.GetClusterName())
1500
        srun.CopyFileToNode(self.pnode.name, ssh_port, os_image)
1501

  
1502 1494
      feedback_fn("* imaging instance disks...")
1503 1495
      try:
1504 1496
        ImageDisks(self, iobj, os_image)

Also available in: Unified diff