summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-12-18 21:41:13 +0000
committerGerrit Code Review <review@openstack.org>2012-12-18 21:41:13 +0000
commit4222329b8129cbb4db2c2df98ad4817f8e696c08 (patch)
treedd5c83c1d1492a0048e495fe779a54534da1ea5c
parent86a0b0e76fe4fdc536ce1260e4cc0a8d34c68ce3 (diff)
parentbeaa53805b67893c2fd7bbed81ea5cfe20354001 (diff)
Merge "network/api add_fixed_ip correctly passes uuid"
-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 beee802c1..b177c60ba 100644
--- a/nova/network/api.py
+++ b/nova/network/api.py
@@ -215,7 +215,7 @@ class API(base.Base):
@refresh_cache
def add_fixed_ip_to_instance(self, context, instance, network_id):
"""Adds a fixed ip to instance from specified network."""
- args = {'instance_id': instance['id'],
+ args = {'instance_id': instance['uuid'],
'host': instance['host'],
'network_id': network_id}
self.network_rpcapi.add_fixed_ip_to_instance(context, **args)