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

Merge pull request #2207 from marktheunissen/mysql-pass-and-password

Browse source 
Adding back support for pass=
This commit is contained in:
Michael DeHaan 2013-02-26 16:12:09 -08:00
commit 9f083bfca3
2 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
library/mysql_db
View file

@ -131,8 +131,20 @@ def load_mycnf():
return False
try:
config.readfp(open(mycnf))
creds = dict(user=config.get('client', 'user'),passwd=config.get('client', 'password'))
except (ConfigParser.NoOptionError, IOError):
except (IOError):
return False
# We support two forms of passwords in .my.cnf, both pass= and password=,
# as these are both supported by MySQL.
try:
passwd = config.get('client', 'password')
except (ConfigParser.NoOptionError):
try:
passwd = config.get('client', 'pass')
except (ConfigParser.NoOptionError):
return False
try:
creds = dict(user=config.get('client', 'user'),passwd=passwd)
except (ConfigParser.NoOptionError):
return False
return creds

16
library/mysql_user
View file

@ -236,8 +236,20 @@ def load_mycnf():
return False
try:
config.readfp(open(mycnf))
creds = dict(user=config.get('client', 'user'),password=config.get('client', 'password'))
except (ConfigParser.NoOptionError, IOError):
except (IOError):
return False
# We support two forms of passwords in .my.cnf, both pass= and password=,
# as these are both supported by MySQL.
try:
passwd = config.get('client', 'password')
except (ConfigParser.NoOptionError):
try:
passwd = config.get('client', 'pass')
except (ConfigParser.NoOptionError):
return False
try:
creds = dict(user=config.get('client', 'user'),passwd=passwd)
except (ConfigParser.NoOptionError):
return False
return creds