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.

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

[PR #1632/afe9ccb5 backport][stable-6] ec2_vpc_nat_gateway - changes to no allocate eip address when connectivity_type=private #1641

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
bugfixes:
- ec2_vpc_nat_gateway - fixes to nat gateway so that when the user creates a private NAT gateway, an Elastic IP address should not be allocated. The module had inncorrectly always allocate elastic IP address when creating private nat gateway (https://github.com/ansible-collections/amazon.aws/pull/1632).
7 changes: 4 additions & 3 deletions plugins/modules/ec2_vpc_nat_gateway.py
Original file line number Diff line number Diff line change
Expand Up @@ -736,10 +736,11 @@ def pre_create(
msg = f"NAT Gateway {existing_gateways[0]['nat_gateway_id']} already exists in subnet_id {subnet_id}"
return changed, msg, results
else:
changed, msg, allocation_id = allocate_eip_address(client, module)
if connectivity_type == "public":
changed, msg, allocation_id = allocate_eip_address(client, module)

if not changed:
return changed, msg, dict()
if not changed:
return changed, msg, dict()

elif eip_address or allocation_id:
if eip_address and not allocation_id:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -919,6 +919,7 @@
- create_ngw.changed
- create_ngw.connectivity_type == 'private'
- '"create_time" in create_ngw'
- '"allocation_id" not in create_ngw.nat_gateway_addresses[0]'

- name: 'set facts: NAT gateway ID'
set_fact:
Expand Down