Merge pull request #898 from elventear/postgresql_user_py24
Fixes for postgresql_user to make it work with postgresql defaults and under Python 2.4
This commit is contained in:
commit
229ab1582a
1 changed files with 13 additions and 6 deletions
|
@ -121,13 +121,20 @@ 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":
|
||||
|
|
Loading…
Reference in a new issue