summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVishvananda Ishaya <vishvananda@yahoo.com>2010-09-09 12:45:51 -0700
committerVishvananda Ishaya <vishvananda@yahoo.com>2010-09-09 12:45:51 -0700
commit8b59df67277dab6533b0076569fecc50b437ec75 (patch)
tree93d19a8074b7fa9f3922b63ae3e7f00bc0158827
parent0173a908aa35d110cdcf11822e8419b95f0de410 (diff)
downloadnova-8b59df67277dab6533b0076569fecc50b437ec75.tar.gz
nova-8b59df67277dab6533b0076569fecc50b437ec75.tar.xz
nova-8b59df67277dab6533b0076569fecc50b437ec75.zip
don't need to pass instance_id to network on associate
-rw-r--r--nova/endpoint/cloud.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/nova/endpoint/cloud.py b/nova/endpoint/cloud.py
index bb24d1f06..397c9c554 100644
--- a/nova/endpoint/cloud.py
+++ b/nova/endpoint/cloud.py
@@ -465,8 +465,7 @@ class CloudController(object):
{"method": "associate_floating_ip",
"args": {"context": None,
"floating_address": floating_ip_ref['str_id'],
- "fixed_address": fixed_ip_ref['str_id'],
- "instance_id": instance_ref['id']}})
+ "fixed_address": fixed_ip_ref['str_id']}})
defer.returnValue({'associateResponse': ["Address associated."]})
@rbac.allow('netadmin')