diff options
| author | Cory Wright <cory.wright@rackspace.com> | 2011-03-25 15:10:56 +0000 |
|---|---|---|
| committer | Cory Wright <cory.wright@rackspace.com> | 2011-03-25 15:10:56 +0000 |
| commit | 4c510d588d4a67a549f5a544f7fa64f97c0022c7 (patch) | |
| tree | a1d02c453b31af713cfad4bad85d47bd29f07cb0 /plugins | |
| parent | 4183eabb7ca46735ab6b87b1469ff089c4f19cb4 (diff) | |
| parent | 162af7b79631b151f03bb46773a1448e6c051325 (diff) | |
| download | nova-4c510d588d4a67a549f5a544f7fa64f97c0022c7.tar.gz nova-4c510d588d4a67a549f5a544f7fa64f97c0022c7.tar.xz nova-4c510d588d4a67a549f5a544f7fa64f97c0022c7.zip | |
merge trunk
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/xenserver/xenapi/etc/xapi.d/plugins/glance | 3 | ||||
| -rw-r--r-- | plugins/xenserver/xenapi/etc/xapi.d/plugins/migration | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance index db39cb0f4..0a45f3873 100644 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance @@ -216,8 +216,7 @@ def _upload_tarball(staging_path, image_id, glance_host, glance_port, os_type): 'x-image-meta-status': 'queued', 'x-image-meta-disk-format': 'vhd', 'x-image-meta-container-format': 'ovf', - 'x-image-meta-property-os-type': os_type, - } + 'x-image-meta-property-os-type': os_type} for header, value in headers.iteritems(): conn.putheader(header, value) diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration index 4aa89863a..75c653408 100644 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration @@ -22,6 +22,7 @@ XenAPI Plugin for transfering data between host nodes import os import os.path import pickle +import shlex import shutil import subprocess @@ -97,7 +98,7 @@ def transfer_vhd(session, args): logging.debug("Preparing to transmit %s to %s" % (source_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' % (ssh_cmd, source_path, dest_path)) |