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

Refix bug 1226 after revert

Browse source 
This patch properly fixes bug 1226 without introducing a breaking
change to idempotency which was introduced in PR #1358

We can properly assign permissions to databases with a '.' in the name
of the database as well as assign priviliges to all databases as
specified with '*'
This commit is contained in:
Sam Yaple 2015-08-19 04:22:31 +00:00 committed by Matt Clay
parent 1b34f1a7ac
commit 52d364b74c
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -317,6 +317,11 @@ def privileges_unpack(priv):
privs = [] privs = []
for item in priv.strip().split('/'): for item in priv.strip().split('/'):
pieces = item.strip().split(':') pieces = item.strip().split(':')
dbpriv = pieces[0].rsplit(".", 1)
# Do not escape if privilege is for database '*' (all databases)
if dbpriv[0].strip('`') != '*':
pieces[0] = "`%s`.%s" % (dbpriv[0].strip('`'), dbpriv[1])
if '.' in pieces[0]: if '.' in pieces[0]:
pieces[0] = pieces[0].split('.') pieces[0] = pieces[0].split('.')
for idx, piece in enumerate(pieces): for idx, piece in enumerate(pieces):