openstack/nova
Code Issues Proposed changes

Some typos

Browse Source
This commit is contained in:
Cerberus
2011-03-16 11:26:40 -05:00
parent 9650e73db3
commit d1469d1566
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/compute/api.py
View File

@@ -443,6 +443,8 @@ class API(base.Base):
params = {'migration_id': migration_ref['id']} params = {'migration_id': migration_ref['id']}
self._cast_compute_message('revert_resize', context, instance_id, self._cast_compute_message('revert_resize', context, instance_id,
migration_ref['dest_compute'], params=params) migration_ref['dest_compute'], params=params)
self.db.migration_update(context, migration_ref['id'],
{'status': 'reverted'})
def confirm_resize(self, context, instance_id): def confirm_resize(self, context, instance_id):
"""Confirms a migration/resize, deleting the 'old' instance in the """Confirms a migration/resize, deleting the 'old' instance in the
@@ -458,7 +460,7 @@ class API(base.Base):
self._cast_compute_message('confirm_resize', context, instance_id, self._cast_compute_message('confirm_resize', context, instance_id,
migration_ref['source_compute'], params=params) migration_ref['source_compute'], params=params)
self.db.migration_update(context, migration_id, self.db.migration_update(context, migration_ref['id'],
{'status': 'confirmed'}) {'status': 'confirmed'})
self.db.instance_update(context, instance_id, self.db.instance_update(context, instance_id,
{'host': migration_ref['dest_compute'], }) {'host': migration_ref['dest_compute'], })

2
plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
View File

@@ -98,7 +98,7 @@ def transfer_vhd(session, args):
logging.debug("Preparing to transmit %s to %s" % (source_path, logging.debug("Preparing to transmit %s to %s" % (source_path,
dest_path)) dest_path))
ssh_cmd = 'ssh -o StrictHostKeyChecking=no' ssh_cmd = '\"ssh -o StrictHostKeyChecking=no\"'
rsync_args = shlex.split('nohup /usr/bin/rsync -av --progress -e %s %s %s' rsync_args = shlex.split('nohup /usr/bin/rsync -av --progress -e %s %s %s'
% (ssh_cmd, source_path, dest_path)) % (ssh_cmd, source_path, dest_path))