From 7f371999dcd0bbae435ed4ef2b405208b19a882e Mon Sep 17 00:00:00 2001 From: Alan Quillin Date: Fri, 11 Mar 2016 19:26:12 -0500 Subject: [PATCH] Removed redundant call to deallocate the floating IP address --- quark/plugin_modules/floating_ips.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/quark/plugin_modules/floating_ips.py b/quark/plugin_modules/floating_ips.py index 5ee5343..1b2ea34 100644 --- a/quark/plugin_modules/floating_ips.py +++ b/quark/plugin_modules/floating_ips.py @@ -271,11 +271,8 @@ def delete_floatingip(context, id): if flip.fixed_ip: flip = db_api.floating_ip_disassociate_fixed_ip(context, flip) - db_api.ip_address_deallocate(context, flip) - - if flip.fixed_ip: - driver = registry.DRIVER_REGISTRY.get_driver() - driver.remove_floating_ip(flip) + driver = registry.DRIVER_REGISTRY.get_driver() + driver.remove_floating_ip(flip) context.session.commit() except Exception: context.session.rollback()