From be5f9094d0163aff40b9924b5070f671f046b1be Mon Sep 17 00:00:00 2001 From: Sebastien LAWNICZAK Date: Thu, 13 Aug 2015 15:51:06 +0200 Subject: [PATCH] Fix : do not try to delete floatingIP if it does not exists --- pkg/cloudprovider/providers/openstack/openstack.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkg/cloudprovider/providers/openstack/openstack.go b/pkg/cloudprovider/providers/openstack/openstack.go index 40ca7c855f4..5144a7dcd34 100644 --- a/pkg/cloudprovider/providers/openstack/openstack.go +++ b/pkg/cloudprovider/providers/openstack/openstack.go @@ -776,9 +776,11 @@ func (lb *LoadBalancer) EnsureTCPLoadBalancerDeleted(name, region string) error if err != nil && !isNotFound(err) { return err } - error := floatingips.Delete(lb.network, floatingIP.ID).ExtractErr() - if error != nil && !isNotFound(error) { - return error + if floatingIP != nil { + error := floatingips.Delete(lb.network, floatingIP.ID).ExtractErr() + if error != nil && !isNotFound(error) { + return error + } } }