diff options
| author | andy <github@anarkystic.com> | 2010-06-24 04:12:00 +0100 |
|---|---|---|
| committer | andy <github@anarkystic.com> | 2010-06-24 04:12:00 +0100 |
| commit | 6fec8caaeb8bfc1fcc7a91be75850d81ff4e5aa6 (patch) | |
| tree | f1bd60e098bbd3b8fd3dd0e85b87c110db511264 | |
| parent | b3417505c28d7205c726715ebf231cb4c291a88a (diff) | |
| download | nova-6fec8caaeb8bfc1fcc7a91be75850d81ff4e5aa6.tar.gz nova-6fec8caaeb8bfc1fcc7a91be75850d81ff4e5aa6.tar.xz nova-6fec8caaeb8bfc1fcc7a91be75850d81ff4e5aa6.zip | |
disk.py needed input for key injection to work
Conflicts:
nova/compute/node.py
| -rw-r--r-- | nova/compute/node.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/compute/node.py b/nova/compute/node.py index 9d95f7e00..3de93d96c 100644 --- a/nova/compute/node.py +++ b/nova/compute/node.py @@ -475,8 +475,9 @@ class Instance(object): yield _fetch_file(data['kernel_id'], basepath('kernel')) if not os.path.exists(basepath('ramdisk')): yield _fetch_file(data['ramdisk_id'], basepath('ramdisk')) - - execute = lambda x: self._pool.simpleExecute(x, error_ok=1) + + execute = lambda cmd, input=None: self._pool.simpleExecute(cmd=cmd, input=input, error_ok=1) + if data['key_data']: logging.info('Injecting key data into image %s', data['image_id']) yield disk.inject_key( |