cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/abompard/ansible into abompard-devel

Browse source
This commit is contained in:
James Cammarata 2013-09-06 13:51:45 -05:00
commit 7752a56091
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
library/database/postgresql_privs
View file

@ -249,12 +249,21 @@ def partial(f, *args, **kwargs):
class Connection(object): class Connection(object):
"""Wrapper around a psycopg2 connection with some convenience methods""" """Wrapper around a psycopg2 connection with some convenience methods"""
def __init__(self, host, port, login, password, database): def __init__(self, params):
self.database = database self.database = params.database
self.connection = psycopg2.connect( # To use defaults values, keyword arguments must be absent, so
host=host, port=port, user=login, # check which values are empty and don't include in the **kw
password=password, database=database # dictionary
) params_map = {
"host":"host",
"login":"user",
"password":"password",
"port":"port",
"database": "database",
}
kw = dict( (params_map[k], getattr(params, k)) for k in params_map
if getattr(params, k) != '' )
self.connection = psycopg2.connect(**kw)
self.cursor = self.connection.cursor() self.cursor = self.connection.cursor()
@ -503,10 +512,10 @@ def main():
roles=dict(required=True, aliases=['role']), roles=dict(required=True, aliases=['role']),
grant_option=dict(required=False, type='bool', grant_option=dict(required=False, type='bool',
aliases=['admin_option']), aliases=['admin_option']),
host=dict(required=False, aliases=['login_host']), host=dict(default='', aliases=['login_host']),
port=dict(type='int', default=5432), port=dict(type='int', default=5432),
login=dict(default='postgres', aliases=['login_user']), login=dict(default='postgres', aliases=['login_user']),
password=dict(required=False, aliases=['login_password']) password=dict(default='', aliases=['login_password'])
), ),
supports_check_mode = True supports_check_mode = True
) )
@ -541,7 +550,7 @@ def main():
if not psycopg2: if not psycopg2:
module.fail_json(msg='Python module "psycopg2" must be installed.') module.fail_json(msg='Python module "psycopg2" must be installed.')
try: try:
conn = Connection(p.host, p.port, p.login, p.password, p.database) conn = Connection(p)
except psycopg2.Error, e: except psycopg2.Error, e:
module.fail_json(msg='Could not connect to database: %s' % e) module.fail_json(msg='Could not connect to database: %s' % e)