summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-10-12 21:08:26 +0000
committerGerrit Code Review <review@openstack.org>2012-10-12 21:08:26 +0000
commit0b971dd9120bd26e8dc534b32d01650fcb87c4f8 (patch)
tree81aed8b98308e0220f8a157d051bf5babe6f4a29
parent7e2baf3e54d1ef9b1e6aebacb7bee852d8d5be63 (diff)
parent66521a1571f0922f791ae7f405129fb99b870f38 (diff)
Merge "Used instance uuid rather than id in remove-fixed-ip"
-rw-r--r--nova/network/api.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/network/api.py b/nova/network/api.py
index f0c4e151d..f98678ab0 100644
--- a/nova/network/api.py
+++ b/nova/network/api.py
@@ -272,7 +272,7 @@ class API(base.Base):
def remove_fixed_ip_from_instance(self, context, instance, address):
"""Removes a fixed ip from instance from specified network."""
- args = {'instance_id': instance['id'],
+ args = {'instance_id': instance['uuid'],
'host': instance['host'],
'address': address}
rpc.call(context, FLAGS.network_topic,