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

Fixing response of floating_ip_show to align with other floating ip's. Spelling fix

Browse source
This commit is contained in:
CEG 2017-06-07 11:33:56 -06:00
parent 58459adbe8
commit 6f66c9d10c
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/cloud/clouds/nova.py
View file

@ -773,7 +773,7 @@ def request_instance(vm_=None, call=None):
raise SaltCloudSystemExit(
'Error assigning floating_ip for {0} on Nova\n\n'
'The following exception was thrown by libcloud when trying to '
'assing a floating ip: {1}\n'.format(
'assign a floating ip: {1}\n'.format(
vm_['name'], exc
)
)

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

@ -1145,7 +1145,14 @@ class SaltNova(object):
floating_ips = nt_ks.floating_ips.list()
for floating_ip in floating_ips:
if floating_ip.ip == ip:
return floating_ip
response = {
'ip': floating_ip.ip,
'fixed_ip': floating_ip.fixed_ip,
'id': floating_ip.id,
'instance_id': floating_ip.instance_id,
'pool': floating_ip.pool
}
return response
return {}
def floating_ip_create(self, pool=None):