From 1ca54af37027702979bd834064fcfa637ccf3ef5 Mon Sep 17 00:00:00 2001 From: Satyajit Bulage Date: Wed, 4 Dec 2019 03:32:28 +0530 Subject: [PATCH] Handle LibraryError exception in postgresql_db (#65229) (#65247) * Added changes into changelogs/fragments * Removed no longer used 'LibraryError'. Signed-off-by: Satyajit Bulage (cherry picked from commit 5f8ec4d46e1fec49eca5c2f351141ed5da6d259e) --- changelogs/fragments/65223-postgresql_db-exception-added.yml | 2 ++ lib/ansible/modules/database/postgresql/postgresql_db.py | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) create mode 100644 changelogs/fragments/65223-postgresql_db-exception-added.yml diff --git a/changelogs/fragments/65223-postgresql_db-exception-added.yml b/changelogs/fragments/65223-postgresql_db-exception-added.yml new file mode 100644 index 00000000000..51656b12808 --- /dev/null +++ b/changelogs/fragments/65223-postgresql_db-exception-added.yml @@ -0,0 +1,2 @@ +bugfixes: + - postgresql_db - Removed exception for 'LibraryError' (https://github.com/ansible/ansible/issues/65223). diff --git a/lib/ansible/modules/database/postgresql/postgresql_db.py b/lib/ansible/modules/database/postgresql/postgresql_db.py index c32e4db3ec7..b245f1d100f 100644 --- a/lib/ansible/modules/database/postgresql/postgresql_db.py +++ b/lib/ansible/modules/database/postgresql/postgresql_db.py @@ -547,9 +547,6 @@ def main(): db_connection.set_isolation_level(psycopg2.extensions.ISOLATION_LEVEL_AUTOCOMMIT) cursor = db_connection.cursor(cursor_factory=psycopg2.extras.DictCursor) - except pgutils.LibraryError as e: - module.fail_json(msg="unable to connect to database: {0}".format(to_native(e)), exception=traceback.format_exc()) - except TypeError as e: if 'sslrootcert' in e.args[0]: module.fail_json(msg='Postgresql server must be at least version 8.4 to support sslrootcert. Exception: {0}'.format(to_native(e)),