Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

os_server: Remove nova_client usage #40765

Merged
merged 1 commit into from
Jun 7, 2018
Merged

os_server: Remove nova_client usage #40765

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions lib/ansible/modules/cloud/openstack/os_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,10 +562,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):
Expand Down Expand Up @@ -606,7 +608,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']:
Expand Down