Don't check deny private_ips already in the original list of private_ips

- Looks like this was originally introduced to resolve an issue with HP
servers putting public_ips in the private_ip list.
- The code has been refactored several times since then.
- This affects the code where 'ssh_interface: private_ips' so we by
definition do not want to use public_ips anyway.
- The original code prevents servers with only private_ips (e.g on
some rackconnect_v3 servers) from building as salt-cloud thinks the
private_ips are not valid.
- ISSUE #46215
This commit is contained in:
Mark Hyde 2018-02-28 08:17:50 +00:00
parent 633e1208e4
commit 50c1e140f0

View file

@ -700,7 +700,7 @@ def _query_node_data(vm_, data, floating, conn):
if not result and ssh_interface(vm_) == 'private_ips':
for private_ip in private:
ignore_ip = ignore_cidr(vm_, private_ip)
if private_ip not in data.private_ips and not ignore_ip:
if not ignore_ip:
result.append(private_ip)
if result: