diff options
| author | Jason Koelker <jason@koelker.net> | 2011-08-12 12:28:53 -0500 |
|---|---|---|
| committer | Jason Koelker <jason@koelker.net> | 2011-08-12 12:28:53 -0500 |
| commit | a256b3718c3e2f44563ca3422820b29dc9e23c74 (patch) | |
| tree | 6acb81367991411236da4804f9c7583b655c01c8 | |
| parent | dbaa1c2299d3b97273698050b372b9714324706a (diff) | |
| parent | 069056b7f5c9b2e9a1c35d37501897fd26100bac (diff) | |
merge the trunk
| -rw-r--r-- | nova/api/openstack/contrib/floating_ips.py | 7 | ||||
| -rw-r--r-- | nova/virt/xenapi/vmops.py | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/nova/api/openstack/contrib/floating_ips.py b/nova/api/openstack/contrib/floating_ips.py index 2aba1068a..c07bfdf09 100644 --- a/nova/api/openstack/contrib/floating_ips.py +++ b/nova/api/openstack/contrib/floating_ips.py @@ -104,12 +104,9 @@ class FloatingIPController(object): ip = self.network_api.get_floating_ip(context, id) if 'fixed_ip' in ip: - try: - self.disassociate(req, id, '') - except Exception as e: - LOG.exception(_("Error disassociating fixed_ip %s"), e) + self.disassociate(req, id) - self.network_api.release_floating_ip(context, address=ip) + self.network_api.release_floating_ip(context, address=ip['address']) return {'released': { "id": ip['id'], diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index b9cd59946..b1522729a 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -186,7 +186,7 @@ class VMOps(object): instance.project_id, ImageType.KERNEL)[0] if instance.ramdisk_id: ramdisk = VMHelper.fetch_image(context, self._session, - instance.id, instance.kernel_id, instance.user_id, + instance.id, instance.ramdisk_id, instance.user_id, instance.project_id, ImageType.RAMDISK)[0] # Create the VM ref and attach the first disk first_vdi_ref = self._session.call_xenapi('VDI.get_by_uuid', |