diff options
| author | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-08-23 14:36:14 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-08-23 14:36:14 -0700 |
| commit | 157ef10b3048f0bb26ce0909d77698ffb37e45df (patch) | |
| tree | 9e9c608678d7828526b93a0ac8a6b9d9ee0eea8a /nova/virt | |
| parent | 78c2175898a468ae734e27dfbc8f5b70f90fd477 (diff) | |
| parent | cfe3b2a6dd73e56652f99a573c1bb0abe5a648d4 (diff) | |
| download | nova-157ef10b3048f0bb26ce0909d77698ffb37e45df.tar.gz nova-157ef10b3048f0bb26ce0909d77698ffb37e45df.tar.xz nova-157ef10b3048f0bb26ce0909d77698ffb37e45df.zip | |
merged trunk and fixed merge errors
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/images.py | 2 | ||||
| -rw-r--r-- | nova/virt/libvirt_conn.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nova/virt/images.py b/nova/virt/images.py index a3ca72bdd..a60bcc4c1 100644 --- a/nova/virt/images.py +++ b/nova/virt/images.py @@ -60,7 +60,7 @@ def _fetch_s3_image(image, path, user, project): url_path) headers['Authorization'] = 'AWS %s:%s' % (access, signature) - cmd = ['/usr/bin/curl', '--silent', url] + cmd = ['/usr/bin/curl', '--fail', '--silent', url] for (k,v) in headers.iteritems(): cmd += ['-H', '%s: %s' % (k,v)] diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py index c4eb3f272..c5e1fbbcd 100644 --- a/nova/virt/libvirt_conn.py +++ b/nova/virt/libvirt_conn.py @@ -225,10 +225,10 @@ class LibvirtConnection(object): if not os.path.exists(basepath('ramdisk')): yield images.fetch(inst.ramdisk_id, basepath('ramdisk'), user, project) - execute = lambda cmd, input=None: \ + execute = lambda cmd, process_input=None: \ process.simple_execute(cmd=cmd, - input=input, - error_ok=1) + process_input=process_input, + check_exit_code=True) key = inst.key_data net = None |