From a2032924adcce758866cd30c744d8a6a47dd4669 Mon Sep 17 00:00:00 2001
From: Pádraig Brady <pbrady@redhat.com>
Date: Sat, 7 Jul 2012 10:37:46 +0100
Subject: fix metadata file injection with xen

The metadata parameter was misordered in commit 1463839f

Fixes Bug: 1022036
Change-Id: Ica0e2f51b6852c8572bdc3c995cc8c2588b9a25c
---
 nova/virt/xenapi/vm_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index 241b0da68..ca0ef15b2 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -1816,7 +1816,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)
-- 
cgit