Merge "fix metadata file injection with xen"

2012-07-11 14:16:43 +00:00
parent 4e251fec89 a2032924ad
commit b91d2fc02d
1 changed files with 1 additions and 1 deletions
@@ -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)