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

This commit is contained in:
Jenkins 2017-06-20 14:16:04 +00:00 committed by Gerrit Code Review
commit f5daebebc1
1 changed files with 1 additions and 1 deletions

View File

@ -5892,7 +5892,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={