ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Merge pull request #898 from elventear/postgresql_user_py24

Browse source 
Fixes for postgresql_user to make it work with postgresql defaults and under Python 2.4
This commit is contained in:
Michael DeHaan 2012-08-17 17:09:35 -07:00
commit 229ab1582a
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
library/postgresql_user
View file

@ -120,14 +120,21 @@ def main():
if not postgresqldb_found:
module.fail_json(msg="the python psycopg2 module is required")
# To use defaults values, keyword arguments must be absent, so
# check which values are empty and don't include in the **kw
# dictionary
params_map = {
"login_host":"host",
"login_user":"user",
"login_password":"password"
}
kw = dict( (params_map[k], v) for (k, v) in module.params.iteritems()
if k in params_map and v != "" )
try:
db_connection = psycopg2.connect(host=module.params["login_host"],
user=module.params["login_user"],
password=module.params["login_password"],
database=db)
db_connection = psycopg2.connect(database=db, **kw)
cursor = db_connection.cursor()
except Exception as e:
except Exception, e:
module.fail_json(msg="unable to connect to database: %s" % e)
if state == "present":