From a172b0afb343e6f543724308b972f3687d5c00fb Mon Sep 17 00:00:00 2001 From: Rick van de Loo Date: Wed, 6 Apr 2022 14:57:14 +0200 Subject: [PATCH] hotfix Caught exception in wait_for_fun utils hotfix like https://github.com/saltstack/salt/pull/61918 but based on the https://github.com/saltstack/salt/releases/tag/v3004.1 tag --- salt/cloud/clouds/openstack.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/salt/cloud/clouds/openstack.py b/salt/cloud/clouds/openstack.py index 6a98081c46d0..ef65805a42c3 100644 --- a/salt/cloud/clouds/openstack.py +++ b/salt/cloud/clouds/openstack.py @@ -444,11 +444,9 @@ def _get_ips(node, addr_type="public"): "OS-EXT-IPS:type" ): ret.append(addr["addr"]) - elif addr_type == "public" and __utils__["cloud.is_public_ip"]( - addr["addr"] - ): + elif addr_type == "public" and salt.utils.cloud.is_public_ip(addr["addr"]): ret.append(addr["addr"]) - elif addr_type == "private" and not __utils__["cloud.is_public_ip"]( + elif addr_type == "private" and not salt.utils.cloud.is_public_ip( addr["addr"] ): ret.append(addr["addr"])