ec2_vpc_nat_gateway - changes to no allocate eip address when connect…

…ivity_type=private (#1632) (#1641)

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

This is a backport of PR #1632 as merged into main (afe9ccb).
SUMMARY

Fixes #1618

ISSUE TYPE


Bugfix Pull Request

COMPONENT NAME

plugins/modules/ec2_vpc_nat_gateway.py
ADDITIONAL INFORMATION

Reviewed-by: Alina Buzachis

changelogs/fragments/1632-changes-to-no-allocate-eip-when-connectivity_type=private.yml

@@ -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).

plugins/modules/ec2_vpc_nat_gateway.py

@@ -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:

tests/integration/targets/ec2_vpc_nat_gateway/tasks/main.yml

@@ -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: