From a6c97f22435924860a02130f976232ae7f891275 Mon Sep 17 00:00:00 2001 From: Dougal Seeley Date: Tue, 4 Sep 2018 16:18:33 +0100 Subject: [PATCH] ec2_vpc_route_table - allow routes to be created if the CIDR already exists but its 'Origin' is 'EnableVgwRoutePropagation' (which cannot be replaced). (#43417) Fixes #43415 --- lib/ansible/modules/cloud/amazon/ec2_vpc_route_table.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/ansible/modules/cloud/amazon/ec2_vpc_route_table.py b/lib/ansible/modules/cloud/amazon/ec2_vpc_route_table.py index 64657eac08c..1567aef29a7 100644 --- a/lib/ansible/modules/cloud/amazon/ec2_vpc_route_table.py +++ b/lib/ansible/modules/cloud/amazon/ec2_vpc_route_table.py @@ -432,8 +432,9 @@ def index_of_matching_route(route_spec, routes_to_match): for i, route in enumerate(routes_to_match): if route_spec_matches_route(route_spec, route): return "exact", i - elif route_spec_matches_route_cidr(route_spec, route): - return "replace", i + elif 'Origin' in route_spec and route_spec['Origin'] != 'EnableVgwRoutePropagation': + if route_spec_matches_route_cidr(route_spec, route): + return "replace", i def ensure_routes(connection=None, module=None, route_table=None, route_specs=None,