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

scaleway_compute: When removing node, wait for transition #444

Merged
merged 1 commit into from
Jun 11, 2020
Merged

scaleway_compute: When removing node, wait for transition #444

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions changelogs/fragments/444-scaleway-improve_removal_handling.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- scaleway_compute - fix transition handling that could cause errors when removing a node (https://github.com/ansible-collections/community.general/pull/444).
10 changes: 6 additions & 4 deletions plugins/modules/cloud/scaleway/scaleway_compute.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,12 @@ def fetch_state(compute_api, server):
compute_api.module.fail_json(msg="Could not fetch state in %s" % response.json)


def wait_to_complete_state_transition(compute_api, server):
wait = compute_api.module.params["wait"]
def wait_to_complete_state_transition(compute_api, server, wait=None):
if wait is None:
wait = compute_api.module.params["wait"]
if not wait:
return

wait_timeout = compute_api.module.params["wait_timeout"]
wait_sleep_time = compute_api.module.params["wait_sleep_time"]

Expand Down Expand Up @@ -353,15 +355,15 @@ def absent_strategy(compute_api, wished_server):

# A server MUST be stopped to be deleted.
while fetch_state(compute_api=compute_api, server=target_server) != "stopped":
wait_to_complete_state_transition(compute_api=compute_api, server=target_server)
wait_to_complete_state_transition(compute_api=compute_api, server=target_server, wait=True)
response = stop_server(compute_api=compute_api, server=target_server)

if not response.ok:
err_msg = 'Error while stopping a server before removing it [{0}: {1}]'.format(response.status_code,
response.json)
compute_api.module.fail_json(msg=err_msg)

wait_to_complete_state_transition(compute_api=compute_api, server=target_server)
wait_to_complete_state_transition(compute_api=compute_api, server=target_server, wait=True)

response = remove_server(compute_api=compute_api, server=target_server)

Expand Down