From 6fec8caaeb8bfc1fcc7a91be75850d81ff4e5aa6 Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 24 Jun 2010 04:12:00 +0100 Subject: disk.py needed input for key injection to work Conflicts: nova/compute/node.py --- nova/compute/node.py | 5 +++-- 1 file 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( -- cgit