Merge lp:~justin-fathomdb/nova/bug724143 into lp:~hudson-openstack/nova/trunk

[justinsb]

Don't require metadata (hotfix for bug 724143)

[Thierry Carrez (ttx)]

This branch is apparently superseded by lp:~justin-fathomdb/nova/test-openstack-api-servers

Please mark this one superseded and see https://code.launchpad.net/~justin-fathomdb/nova/test-openstack-api-servers/+merge/51089 instead.

review: Disapprove

[justinsb (justin-fathomdb)]

Thierry: This patch is a hotfix. It works around the bug so that the affected user can carry on. The other branch has the fix, but also also a lot of dependencies to support testing (e.g. keys & volumes code), and probably is at least 2 days from being merged. The affected user shouldn't be out-of-operation for those 2+ days. Nor should the affected user merge the other branch, because it's likely to change during the review process, and I'm not yet making the same promises about that branch that I will once it lands in trunk.

The good news is that the fix is the same in both branches, so the hotfix looks good.

[Jay Pipes (jaypipes)]

lgtm.

review: Approve

[Vish Ishaya (vishvananda)]

hotfix lgtm.

review: Approve

=== modified file 'nova/api/openstack/servers.py'
--- nova/api/openstack/servers.py	2011-02-23 22:50:33 +0000
+++ nova/api/openstack/servers.py	2011-02-24 07:01:57 +0000
@@ -177,7 +177,7 @@
         # However, the CloudServers API is not definitive on this front,
         #  and we want to be compatible.
         metadata = []
-        if env['server']['metadata']:
+        if env['server'].get('metadata'):
             for k, v in env['server']['metadata'].items():
                 metadata.append({'key': k, 'value': v})