summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Kölker <jason@koelker.net>2011-05-25 11:24:44 -0500
committerJason Kölker <jason@koelker.net>2011-05-25 11:24:44 -0500
commitd9a4713133f4d864dd584fd3ce044b025ee53820 (patch)
tree58c001e5c7d797e6d39c0eee262c0de93f1e3891
parent929544f9c9acdb1f5979d2e1458aef4045308028 (diff)
return the result of the function
-rw-r--r--nova/network/manager.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py
index 20676cd15..5da1268d3 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -180,7 +180,7 @@ class FloatingIP(object):
# call the next inherited class's allocate_for_instance()
# which is currently the NetworkManager version
# do this first so fixed ip is already allocated
- super(FloatingIP, self).allocate_for_instance(context, **kwargs)
+ ips = super(FloatingIP, self).allocate_for_instance(context, **kwargs)
if FLAGS.auto_assign_floating_ip:
# allocate a floating ip (public_ip is just the address string)
public_ip = self.allocate_floating_ip(context, project_id)
@@ -200,6 +200,7 @@ class FloatingIP(object):
floating_ip,
fixed_ip,
affect_auto_assigned=True)
+ return ips
def deallocate_for_instance(self, context, **kwargs):
"""handles deallocating floating IP resources for an instance