ec2_vpc_route_table: Don't fail if a route was already created. (#359)

ansible-collections · Mar 24, 2021 · 73d60e5 · 73d60e5
1 parent 0412f00
commit 73d60e5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/changelogs/fragments/359-fix-ec2_vpc_route_table.yml b/changelogs/fragments/359-fix-ec2_vpc_route_table.yml
@@ -0,0 +1,2 @@
+bugfixes:
+  - ec2_vpc_route_table - catch RouteAlreadyExists error when rerunning same task twice to make module idempotent
diff --git a/plugins/modules/ec2_vpc_route_table.py b/plugins/modules/ec2_vpc_route_table.py
@@ -492,20 +492,16 @@ def ensure_routes(connection=None, module=None, route_table=None, route_specs=No
 
         for route_spec in route_specs_to_recreate:
             try:
-                connection.replace_route(
-                    aws_retry=True,
-                    RouteTableId=route_table['RouteTableId'],
-                    **route_spec)
+                connection.replace_route(aws_retry=True, RouteTableId=route_table['RouteTableId'], **route_spec)
             except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e:
                 module.fail_json_aws(e, msg="Couldn't recreate route")
 
         for route_spec in route_specs_to_create:
             try:
-                connection.create_route(
-                    aws_retry=True,
-                    RouteTableId=route_table['RouteTableId'],
-                    **route_spec)
-            except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e:
+                connection.create_route(aws_retry=True, RouteTableId=route_table['RouteTableId'], **route_spec)
+            except is_boto3_error_code('RouteAlreadyExists'):
+                changed = False
+            except (botocore.exceptions.ClientError, botocore.exceptions.BotoCoreError) as e:  # pylint: disable=duplicate-except
                 module.fail_json_aws(e, msg="Couldn't create route")
 
     return {'changed': bool(changed)}