openstack
/
shade
Code Issues Proposed changes

Don't try to delete fips on non-fip clouds 

There is no need to even go through the logic. We have a flag for this.

Change-Id: I103a2f346344d7a1eed5c54b58d279f04a1f76a3
This commit is contained in:
Monty Taylor 2017-06-20 07:44:30 -05:00
parent 10beaf9c43
commit 2486e09b67
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shade/openstackcloud.py
View File

@ -5889,7 +5889,7 @@ class OpenStackCloud(
if not server:
return False
if delete_ips:
if delete_ips and self._has_floating_ips():
# TODO(mordred) Does the server have floating ips in its
# addresses dict? If not, skip this.
ips = self.search_floating_ips(filters={