Merge lp:~justin-fathomdb/nova/bug724623-fix-2 into lp:~hudson-openstack/nova/trunk

[justinsb]

Backfix of bugfix of issue blocking creating servers with metadata

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Dan Prince (dan-prince)]

Approve.

[Rick Harris (rconradharris)]

lgtm

review: Approve

=== modified file 'nova/db/sqlalchemy/api.py'
--- nova/db/sqlalchemy/api.py	2011-03-14 17:59:41 +0000
+++ nova/db/sqlalchemy/api.py	2011-03-15 04:31:24 +0000
@@ -746,6 +746,15 @@
     context - request context object
     values - dict containing column values.
     """
+    metadata = values.get('metadata')
+    metadata_refs = []
+    if metadata:
+        for metadata_item in metadata:
+            metadata_ref = models.InstanceMetadata()
+            metadata_ref.update(metadata_item)
+            metadata_refs.append(metadata_ref)
+    values['metadata'] = metadata_refs
+
     instance_ref = models.Instance()
     instance_ref.update(values)