diff --git a/changelogs/fragments/501-ec2_eni-timeout.yml b/changelogs/fragments/501-ec2_eni-timeout.yml new file mode 100644 index 00000000000..89a5db69e65 --- /dev/null +++ b/changelogs/fragments/501-ec2_eni-timeout.yml @@ -0,0 +1,2 @@ +minor_changes: +- ec2_eni - timeout increased when waiting for ENIs to finish detaching (https://github.com/ansible-collections/amazon.aws/pull/501). diff --git a/plugins/modules/ec2_eni.py b/plugins/modules/ec2_eni.py index d9a82a73934..640130e1312 100644 --- a/plugins/modules/ec2_eni.py +++ b/plugins/modules/ec2_eni.py @@ -684,9 +684,12 @@ def detach_eni(connection, eni, module): connection.detach_network_interface( aws_retry=True, AttachmentId=eni["Attachment"]["AttachmentId"], - Force=force_detach + Force=force_detach, + ) + get_waiter(connection, 'network_interface_available').wait( + NetworkInterfaceIds=[eni_id], + WaiterConfig={'Delay': 5, 'MaxAttempts': 80}, ) - get_waiter(connection, 'network_interface_available').wait(NetworkInterfaceIds=[eni_id]) return True return False diff --git a/tests/integration/targets/ec2_eni/aliases b/tests/integration/targets/ec2_eni/aliases index d140bc3a655..4fc9a91e159 100644 --- a/tests/integration/targets/ec2_eni/aliases +++ b/tests/integration/targets/ec2_eni/aliases @@ -1,3 +1,4 @@ +unstable + cloud/aws -slow ec2_eni_info