Wait for VPC creation before waiting for availability (on creation)

plugins/modules/ec2_vpc_net.py

@@ -251,6 +251,14 @@ def get_classic_link_with_backoff(connection, vpc_id):
         return False
 
 
+def wait_for_vpc_to_exist(module, connection, **params):
+    # wait for vpc to be available
+    try:
+        get_waiter(connection, 'vpc_exists').wait(**params)
+    except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e:
+        module.fail_json_aws(e, msg="Unable to wait for VPC creation.")
+
+
 def wait_for_vpc(module, connection, **params):
     # wait for vpc to be available
     try:
@@ -327,7 +335,13 @@ def create_vpc(connection, module, cidr_block, tenancy):
         module.fail_json_aws(e, "Failed to create the VPC")
 
     # wait up to 30 seconds for vpc to exist
-    wait_for_vpc(
+    wait_for_vpc_to_exist(
+        module, connection,
+        VpcIds=[vpc_obj['Vpc']['VpcId']],
+        WaiterConfig=dict(MaxAttempts=30)
+    )
+    # Wait for the VPC to enter an 'Available' State
+    wait_for_vpc_to_exist(
         module, connection,
         VpcIds=[vpc_obj['Vpc']['VpcId']],
         WaiterConfig=dict(MaxAttempts=30)