diff options
| author | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-09-16 12:39:35 -0400 |
|---|---|---|
| committer | Michael Gundlach <michael.gundlach@rackspace.com> | 2010-09-16 12:39:35 -0400 |
| commit | 8e304fe0bf69fe5f6bad2fa3d5a71a93cb0612e8 (patch) | |
| tree | 6fcdcea61420089517dc4b0976cc6114e847387f /nova/api | |
| parent | a458a5a6987f151403aa8d4fbc9440396712e3d7 (diff) | |
| download | nova-8e304fe0bf69fe5f6bad2fa3d5a71a93cb0612e8.tar.gz nova-8e304fe0bf69fe5f6bad2fa3d5a71a93cb0612e8.tar.xz nova-8e304fe0bf69fe5f6bad2fa3d5a71a93cb0612e8.zip | |
Fix things not quite merged perfectly -- all tests now pass
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/ec2/cloud.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 7a9b5f5cf..c04e722cc 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -556,7 +556,7 @@ class CloudController(object): # NOTE(vish): Right now we don't really care if the ip is # disassociated. We may need to worry about # checking this later. Perhaps in the scheduler? - network_topic = yield self._get_network_topic(context) + network_topic = self._get_network_topic(context) rpc.cast(network_topic, {"method": "disassociate_floating_ip", "args": {"context": None, |