valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #23573 from techhat/novaquery

Browse Source 
Scan all available networks for public and private IPs
This commit is contained in:
Thomas S Hatch 2015-05-12 09:22:22 -06:00
commit cd34b9b6c4
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
salt/cloud/clouds/nova.py
View File

@ -762,14 +762,35 @@ def list_nodes(call=None, **kwargs):
return {}
for server in server_list:
server_tmp = conn.server_show(server_list[server]['id'])[server]
private = []
public = []
if 'addresses' not in server_tmp:
server_tmp['addresses'] = {}
for network in server_tmp['addresses'].keys():
for address in server_tmp['addresses'][network]:
if salt.utils.cloud.is_public_ip(address.get('addr', '')):
public.append(address['addr'])
elif ':' in address['addr']:
public.append(address['addr'])
elif '.' in address['addr']:
private.append(address['addr'])
if server_tmp['accessIPv4']:
if salt.utils.cloud.is_public_ip(server_tmp['accessIPv4']):
public.append(server_tmp['accessIPv4'])
else:
private.append(server_tmp['accessIPv4'])
if server_tmp['accessIPv6']:
public.append(server_tmp['accessIPv6'])
ret[server] = {
'id': server_tmp['id'],
'image': server_tmp['image']['id'],
'size': server_tmp['flavor']['id'],
'state': server_tmp['state'],
'private_ips': [addrs['addr'] for addrs in
server_tmp['addresses'].get('private', [])],
'public_ips': [server_tmp['accessIPv4'], server_tmp['accessIPv6']],
'private_ips': public,
'public_ips': private,
}
return ret