saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

include all ips in public_ips or private_ips

Browse source
This commit is contained in:
Daniel Wallace 2016-02-11 00:10:50 -06:00
parent b2e8202f5d
commit 47ecb7a150
1 changed files with 8 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
salt/utils/openstack/nova.py
View file

@ -139,22 +139,14 @@ class NovaServer(object):
'access_ip': server['accessIPv4']
}
if 'addresses' in server:
if 'public' in server['addresses']:
self.public_ips = [
ip['addr'] for ip in server['addresses']['public']
]
else:
self.public_ips = []
if 'private' in server['addresses']:
self.private_ips = [
ip['addr'] for ip in server['addresses']['private']
]
else:
self.private_ips = []
self.addresses = server['addresses']
self.addresses = server.get('addresses', {})
self.public_ips, self.private_ips = [], []
for network in self.addresses.values():
for addr in network:
if salt.utils.cloud.is_public_ip(addr['addr']):
self.public_ips.append(addr['addr'])
else:
self.private_ips.append(addr['addr'])
if password:
self.extra['password'] = password