Use NormalizedOperationMethod to catch ClientErrors so the waiter can…

… handle them properly (ansible#37356) (cherry picked from commit c9e8aca)
s-hertel · Apr 27, 2018 · 3d6b103 · 3d6b103
1 parent eb18dd4
commit 3d6b103
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/lib/ansible/module_utils/aws/waiters.py b/lib/ansible/module_utils/aws/waiters.py
@@ -24,7 +24,7 @@
                     "matcher": "error",
                     "expected": "InvalidRouteTableID.NotFound",
                     "state": "retry"
-                }
+                },
             ]
         }
     }
@@ -40,7 +40,9 @@ def model_for(name):
     ('EC2', 'route_table_exists'): lambda ec2: core_waiter.Waiter(
         'route_table_exists',
         model_for('RouteTableExists'),
-        ec2.describe_route_tables)
+        core_waiter.NormalizedOperationMethod(
+            ec2.describe_route_tables
+        ))
 }