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

Merge pull request #2175 from tyll/devel

Browse source 
mysql_db/user: Use password for my.cnf
This commit is contained in:
Michael DeHaan 2013-02-23 09:52:14 -08:00
commit ac41a9d1f0
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
library/mysql_db
View file

@ -131,7 +131,7 @@ def load_mycnf():
return False
try:
config.readfp(open(mycnf))
creds = dict(user=config.get('client', 'user'),passwd=config.get('client', 'pass'))
creds = dict(user=config.get('client', 'user'),passwd=config.get('client', 'password'))
except (ConfigParser.NoOptionError, IOError):
return False
return creds

10
library/mysql_user
View file

@ -213,7 +213,13 @@ def privileges_revoke(cursor, user,host,db_table):
query = "REVOKE ALL PRIVILEGES ON %s FROM '%s'@'%s'" % (db_table,user,host)
cursor.execute(query)
query = "REVOKE GRANT OPTION ON %s FROM '%s'@'%s'" % (db_table,user,host)
cursor.execute(query)
try:
cursor.execute(query)
except MySQLdb.OperationalError, e:
# 1141 -> There is no such grant defined for user ... on host ...
# If this exception is raised, there is no need to revoke the GRANT privilege
if e.args[0] != 1141 or not e.args[1].startswith("There is no such grant defined for user"):
raise e
def privileges_grant(cursor, user,host,db_table,priv):
@ -230,7 +236,7 @@ def load_mycnf():
return False
try:
config.readfp(open(mycnf))
creds = dict(user=config.get('client', 'user'),password=config.get('client', 'pass'))
creds = dict(user=config.get('client', 'user'),password=config.get('client', 'password'))
except (ConfigParser.NoOptionError, IOError):
return False
return creds