openstack/nova
Code Issues Proposed changes

Some stuff

Browse Source
This commit is contained in:
Cerberus
2011-02-07 17:12:15 -06:00
parent e59c62efe5
commit a40f604155
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/virt/xenapi_conn.py
View File

@@ -193,7 +193,7 @@ class XenAPIConnection(object):
self._vmops.power_on(instance) self._vmops.power_on(instance)
def transfer_disk(self, instance, dest, callback): def transfer_disk(self, instance, dest, callback):
self._vmops.transfer_disk() self._vmops.transfer_disk(dest)
def suspend(self, instance, callback): def suspend(self, instance, callback):
"""suspend the specified instance""" """suspend the specified instance"""

12
plugins/xenserver/xenapi/etc/xapi.d/plugins/data_transfer
View File

@@ -28,10 +28,13 @@ import XenAPIPlugin
SSH_HOSTS = '/root/.ssh/known_hosts' SSH_HOSTS = '/root/.ssh/known_hosts'
DEVNULL = '/dev/null' DEVNULL = '/dev/null'
KEYSCAN = '/usr/bin/ssh-keyscan' KEYSCAN = '/usr/bin/ssh-keyscan'
RSYNC = '/usr/bin/rsync'
def _key_scan_and_add(host): def _key_scan_and_add(host):
"""SSH scans a remote host and writes the SSH key out to known_hosts""" """SSH scans a remote host and writes the SSH key out to known_hosts"""
# Touch the file if it doesn't yet exist
open(SSH_HOSTS, 'a').close() open(SSH_HOSTS, 'a').close()
null = open(DEVNULL, 'w') null = open(DEVNULL, 'w')
known_hosts = open(SSH_HOSTS, 'a') known_hosts = open(SSH_HOSTS, 'a')
key = subprocess.Popen(['/usr/bin/ssh-keyscan', '-t', 'rsa', host], key = subprocess.Popen(['/usr/bin/ssh-keyscan', '-t', 'rsa', host],
@@ -42,3 +45,12 @@ def _key_scan_and_add(host):
known_hosts.write(key) known_hosts.write(key)
null.close() null.close()
known_hosts.close() known_hosts.close()
def transfer_vhd(host, vhd_path):
"""Rsyncs a VHD to an adjacent host"""
_key_scan_and_add(host)
if subprocess.call([RSYNC, vhd_path, "%s:/root/" % host]) != 0:
raise Exception("Unexpected VHD transfer failure")
if __name__ == '__main__':
XenAPIPlugin.dispatch({'transfer_vhd': transfer_vhd})