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

mysql_user: fix unresolved reference

Browse source 
L282, module is used but not passed into function. Replaced check_mode reference and used module instead since check_mode is also in module.
This commit is contained in:
Rene Moser 2016-05-02 18:42:31 +02:00 committed by Matt Clay
parent 6a7682c7ea
commit 9f1cfe07bb
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -247,7 +247,7 @@ def is_hash(password):
ishash = True ishash = True
return ishash return ishash
def user_mod(cursor, user, host, host_all, password, encrypted, new_priv, append_privs, check_mode): def user_mod(cursor, user, host, host_all, password, encrypted, new_priv, append_privs, module):
changed = False changed = False
grant_option = False grant_option = False
@ -279,7 +279,7 @@ def user_mod(cursor, user, host, host_all, password, encrypted, new_priv, append
encrypted_string = (password) encrypted_string = (password)
if is_hash(password): if is_hash(password):
if current_pass_hash[0] != encrypted_string: if current_pass_hash[0] != encrypted_string:
if check_mode: if module.check_mode:
return True return True
if old_user_mgmt: if old_user_mgmt:
cursor.execute("SET PASSWORD FOR %s@%s = %s", (user, host, password)) cursor.execute("SET PASSWORD FOR %s@%s = %s", (user, host, password))
@ -295,7 +295,7 @@ def user_mod(cursor, user, host, host_all, password, encrypted, new_priv, append
cursor.execute("SELECT CONCAT('*', UCASE(SHA1(UNHEX(SHA1(%s)))))", (password,)) cursor.execute("SELECT CONCAT('*', UCASE(SHA1(UNHEX(SHA1(%s)))))", (password,))
new_pass_hash = cursor.fetchone() new_pass_hash = cursor.fetchone()
if current_pass_hash[0] != new_pass_hash[0]: if current_pass_hash[0] != new_pass_hash[0]:
if check_mode: if module.check_mode:
return True return True
if old_user_mgmt: if old_user_mgmt:
cursor.execute("SET PASSWORD FOR %s@%s = %s", (user, host, password)) cursor.execute("SET PASSWORD FOR %s@%s = %s", (user, host, password))
@ -315,7 +315,7 @@ def user_mod(cursor, user, host, host_all, password, encrypted, new_priv, append
grant_option = True grant_option = True
if db_table not in new_priv: if db_table not in new_priv:
if user != "root" and "PROXY" not in priv and not append_privs: if user != "root" and "PROXY" not in priv and not append_privs:
if check_mode: if module.check_mode:
return True return True
privileges_revoke(cursor, user,host,db_table,priv,grant_option) privileges_revoke(cursor, user,host,db_table,priv,grant_option)
changed = True changed = True
@ -324,7 +324,7 @@ def user_mod(cursor, user, host, host_all, password, encrypted, new_priv, append
# we can perform a straight grant operation. # we can perform a straight grant operation.
for db_table, priv in new_priv.iteritems(): for db_table, priv in new_priv.iteritems():
if db_table not in curr_priv: if db_table not in curr_priv:
if check_mode: if module.check_mode:
return True return True
privileges_grant(cursor, user,host,db_table,priv) privileges_grant(cursor, user,host,db_table,priv)
changed = True changed = True
@ -335,7 +335,7 @@ def user_mod(cursor, user, host, host_all, password, encrypted, new_priv, append
for db_table in db_table_intersect: for db_table in db_table_intersect:
priv_diff = set(new_priv[db_table]) ^ set(curr_priv[db_table]) priv_diff = set(new_priv[db_table]) ^ set(curr_priv[db_table])
if (len(priv_diff) > 0): if (len(priv_diff) > 0):
if check_mode: if module.check_mode:
return True return True
if not append_privs: if not append_privs:
privileges_revoke(cursor, user,host,db_table,curr_priv[db_table],grant_option) privileges_revoke(cursor, user,host,db_table,curr_priv[db_table],grant_option)
@ -561,9 +561,9 @@ def main():
if user_exists(cursor, user, host): if user_exists(cursor, user, host):
try: try:
if update_password == 'always': if update_password == 'always':
changed = user_mod(cursor, user, host, host_all, password, encrypted, priv, append_privs, module.check_mode) changed = user_mod(cursor, user, host, host_all, password, encrypted, priv, append_privs, module)
else: else:
changed = user_mod(cursor, user, host, host_all, None, encrypted, priv, append_privs, module.check_mode) changed = user_mod(cursor, user, host, host_all, None, encrypted, priv, append_privs, module)
except (SQLParseError, InvalidPrivsError, MySQLdb.Error), e: except (SQLParseError, InvalidPrivsError, MySQLdb.Error), e:
module.fail_json(msg=str(e)) module.fail_json(msg=str(e))