diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-11 14:16:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-11 14:16:43 +0000 |
| commit | b91d2fc02d927066ed0fe21439ccb7548de4138f (patch) | |
| tree | dfce4708b1221ffafb86baffbbe2c8ce4e97a9e0 | |
| parent | 4e251fec893821697080c7b65748a337b61e47e2 (diff) | |
| parent | a2032924adcce758866cd30c744d8a6a47dd4669 (diff) | |
Merge "fix metadata file injection with xen"
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index d28da3ca8..bd69923d6 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -1865,7 +1865,7 @@ def _mounted_processing(device, key, net, metadata): # for xenapi, we don't 'inject' admin_password here, # it's handled at instance startup time disk.inject_data_into_fs(tmpdir, - key, net, None, metadata, + key, net, metadata, None, utils.execute) finally: utils.execute('umount', dev_path, run_as_root=True) |