summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@yahoo.com>2010-09-09 11:07:10 -0700
committerVishvananda Ishaya <vishvananda@yahoo.com>2010-09-09 11:07:10 -0700
commitc08c21d6ceeeb2d8241ae5222b744bed64d327f3 (patch)
tree53bb21af2af3f03a98a06a28d0cb1695c040fa36 /nova
parentb3503ebcd7def01b523e0724ccec6fad9be12c93 (diff)
solution that works with this version
Diffstat (limited to 'nova')
-rw-r--r--nova/endpoint/cloud.py5
1 files changed, 2 insertions, 3 deletions
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():