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

use default value for parameter config_file in connect()

Browse source
This commit is contained in:
Sven Schliesing 2015-04-22 20:32:39 +02:00 committed by Matt Clay
parent dcb8fa0cb9
commit 90d434d66d
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/modules/database/mysql/mysql_user.py
View file

@ -183,11 +183,7 @@ class InvalidPrivsError(Exception):
# MySQL module specific support methods.
#
def connect(module, login_user, login_password, config_file):
default_file = '~/.my.cnf'
if config_file is not None:
default_file = config_file
def connect(module, login_user, login_password, config_file='~/.my.cnf'):
config = {
'host': module.params['login_host'],
'db': 'mysql'
@ -198,8 +194,8 @@ def connect(module, login_user, login_password, config_file):
else:
config['port'] = module.params['login_port']
if os.path.exists(default_file):
config['read_default_file'] = default_file
if os.path.exists(config_file):
config['read_default_file'] = config_file
else:
config['user'] = login_user
config['passwd'] = login_password