openstack/shade
Code Issues Proposed changes

Fix floating ip removal on delete server

Browse Source 
A conditional block was not sufficiently indented.

Change-Id: Ia4ab58cc476505570163f7f855fc5a679c7b8d57
This commit is contained in:
James E. Blair
2015-10-14 10:27:05 -07:00
parent 688ca1f3ce
commit bcd507a779
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
shade/__init__.py
View File

@@ -2854,15 +2854,15 @@ class OpenStackCloud(object):
if floating_ip:
ips = self.search_floating_ips(filters={
'floating_ip_address': floating_ip})
if len(ips) != 1:
raise OpenStackException(
"Tried to delete floating ip {floating_ip}"
" associated with server {id} but there was"
" an error finding it. Something is exceptionally"
" broken.".format(
floating_ip=floating_ip,
id=server['id']))
self.delete_floating_ip(ips[0]['id'])
if len(ips) != 1:
raise OpenStackException(
"Tried to delete floating ip {floating_ip}"
" associated with server {id} but there was"
" an error finding it. Something is exceptionally"
" broken.".format(
floating_ip=floating_ip,
id=server['id']))
self.delete_floating_ip(ips[0]['id'])
try:
self.manager.submitTask(
_tasks.ServerDelete(server=server['id']))