added try/except around conn.get_all_dbinstances

11 years ago · 898889d20e
parent d25622f17e
commit 898889d20e
1 changed files with 6 additions and 2 deletions
--- a/library/cloud/rds
+++ b/library/cloud/rds
@ -463,8 +463,12 @@ def main():
    if command == 'delete' and not wait:
        module.exit_json(changed=True)

-    instances = conn.get_all_dbinstances(instance_name)
-    my_inst = instances[0]
+    try: 
+        instances = conn.get_all_dbinstances(instance_name)
+        my_inst = instances[0]
+    except boto.exception.BotoServerError, e:
+        module.fail_json(msg = e.error_message)
+

    # Wait for the instance to be available if requested
    if wait: