From c08c21d6ceeeb2d8241ae5222b744bed64d327f3 Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Thu, 9 Sep 2010 11:07:10 -0700 Subject: solution that works with this version --- nova/endpoint/cloud.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'nova') diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py index 9a09454a2..f84360c9c 100644 --- a/nova/endpoint/cloud.py +++ b/nova/endpoint/cloud.py @@ -421,9 +421,8 @@ class CloudController(object): context.project.id) for floating_ip_ref in iterator: address = floating_ip_ref['str_id'] - instance_id = None - if floating_ip_ref['instance']: - instance_id = floating_ip_ref['instance']['str_id'] + instance_ref = db.floating_ip_get_instance(context, address) + instance_id = instance_ref['str_id'] address_rv = {'public_ip': address, 'instance_id': instance_id} if context.user.is_admin(): -- cgit