diff options
| author | Soren Hansen <soren@linux2go.dk> | 2011-03-10 11:35:42 +0100 |
|---|---|---|
| committer | Soren Hansen <soren@linux2go.dk> | 2011-03-10 11:35:42 +0100 |
| commit | 6601d52bfa501ac1ae266647be19fac2f6792efc (patch) | |
| tree | d947d593b620ed45cf16e2714ddf5a96922b7ef3 /nova | |
| parent | e575f5ddd46055f2e491606052493b6d648506f6 (diff) | |
| download | nova-6601d52bfa501ac1ae266647be19fac2f6792efc.tar.gz nova-6601d52bfa501ac1ae266647be19fac2f6792efc.tar.xz nova-6601d52bfa501ac1ae266647be19fac2f6792efc.zip | |
Make nova.image.s3 catch up with the new execute syntax.
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/image/s3.py | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/nova/image/s3.py b/nova/image/s3.py index bbc54c263..85a2c651c 100644 --- a/nova/image/s3.py +++ b/nova/image/s3.py @@ -236,25 +236,32 @@ class S3ImageService(service.BaseImageService): @staticmethod def _decrypt_image(encrypted_filename, encrypted_key, encrypted_iv, cloud_private_key, decrypted_filename): - key, err = utils.execute( - 'openssl rsautl -decrypt -inkey %s' % cloud_private_key, - process_input=encrypted_key, - check_exit_code=False) + key, err = utils.execute('openssl', + 'rsautl', + '-decrypt', + '-inkey', '%s' % cloud_private_key, + process_input=encrypted_key, + check_exit_code=False) if err: raise exception.Error(_("Failed to decrypt private key: %s") % err) - iv, err = utils.execute( - 'openssl rsautl -decrypt -inkey %s' % cloud_private_key, - process_input=encrypted_iv, - check_exit_code=False) + iv, err = utils.execute('openssl', + 'rsautl', + '-decrypt', + '-inkey', '%s' % cloud_private_key, + process_input=encrypted_iv, + check_exit_code=False) if err: raise exception.Error(_("Failed to decrypt initialization " "vector: %s") % err) - _out, err = utils.execute( - 'openssl enc -d -aes-128-cbc -in %s -K %s -iv %s -out %s' - % (encrypted_filename, key, iv, decrypted_filename), - check_exit_code=False) + _out, err = utils.execute('openssl', 'enc', + '-d', '-aes-128-cbc', + '-in', '%s' % (encrypted_filename,), + '-K', '%s' % (key,), + '-iv', '%s' % (iv,), + '-out', '%s' % (decrypted_filename,), + check_exit_code=False) if err: raise exception.Error(_("Failed to decrypt image file " "%(image_file)s: %(err)s") % |