cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

os_server: Remove nova_client usage (#40462)

Browse source 
The os_server module uses the deprecated nova_client function, and
therefore ends up requiring python-novaclient installed. In this
patch we switch the ip detachment to make use of a shade function,
removing the need for python-novaclient.
This commit is contained in:
Jesse Pretorius 2018-05-25 18:43:12 +01:00 committed by Monty Taylor
parent 7e603c3cb1
commit f53a29f392
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/modules/cloud/openstack/os_server.py
View file

@ -538,10 +538,12 @@ def _update_server(module, cloud, server):
return (changed, server)
def _delete_floating_ip_list(cloud, server, extra_ips):
def _detach_ip_list(cloud, server, extra_ips):
for ip in extra_ips:
cloud.nova_client.servers.remove_floating_ip(
server=server.id, address=ip)
ip_id = cloud.get_floating_ip(
id=None, filters={'floating_ip_address': ip})
cloud.detach_ip_from_server(
server_id=server.id, floating_ip_id=ip_id)
def _check_ips(module, cloud, server):
@ -582,7 +584,7 @@ def _check_ips(module, cloud, server):
if ip not in floating_ips:
extra_ips.append(ip)
if extra_ips:
_delete_floating_ip_list(cloud, server, extra_ips)
_detach_ip_list(cloud, server, extra_ips)
changed = True
elif auto_ip:
if server['interface_ip']: