Merge "Don't try to delete fips on non-fip clouds"
This commit is contained in:
commit
f5daebebc1
|
@ -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={
|
||||
|
|
Loading…
Reference in New Issue