return True
-def AddNode(dsa, dsapub, rsa, rsapub, ssh, sshpub):
+def AddNode(dsa, dsapub, rsa, rsapub, sshkey, sshpub):
""" adds the node to the cluster
- updates the hostkey
- adds the ssh-key
os.mkdir("/root/.ssh")
f = open("/root/.ssh/id_dsa", 'w')
- f.write(ssh)
+ f.write(sshkey)
f.close()
f = open("/root/.ssh/id_dsa.pub", 'w')
create_script = inst_os.create_script
- for os_device in instance.disks:
- if os_device.iv_name == os_disk:
- break
- else:
+ os_device = instance.FindDisk(os_disk)
+ if os_device is None:
logger.Error("Can't find this device-visible name '%s'" % os_disk)
return False
- for swap_device in instance.disks:
- if swap_device.iv_name == swap_disk:
- break
- else:
+ swap_device = instance.FindDisk(swap_disk)
+ if swap_device is None:
logger.Error("Can't find this device-visible name '%s'" % swap_disk)
return False
inst_os = OSFromDisk(instance.os)
import_script = inst_os.import_script
- for os_device in instance.disks:
- if os_device.iv_name == os_disk:
- break
- else:
+ os_device = instance.FindDisk(os_disk)
+ if os_device is None:
logger.Error("Can't find this device-visible name '%s'" % os_disk)
return False
- for swap_device in instance.disks:
- if swap_device.iv_name == swap_disk:
- break
- else:
+ swap_device = instance.FindDisk(swap_disk)
+ if swap_device is None:
logger.Error("Can't find this device-visible name '%s'" % swap_disk)
return False