Permalink
Browse files

Addressing user creation on mysql 5.7

After creating user on mysql 5.7, check fails. This should work in addition to changes mentioned in  saltstack#29265 .
  • Loading branch information...
michalsuba committed Jan 28, 2016
1 parent 1329d21 commit 6a115f271c59121e5e9f100c17e72c87fd165891
Showing with 2 additions and 1 deletion.
  1. +2 −1 salt/modules/mysql.py
View
@@ -1185,6 +1185,7 @@ def user_create(user,
password_hash=None,
allow_passwordless=False,
unix_socket=False,
+ password_column='Password',
**connection_args):
'''
Creates a MySQL user
@@ -1267,7 +1268,7 @@ def user_create(user,
log.error(err)
return False
- if user_exists(user, host, password, password_hash, **connection_args):
+ if user_exists(user, host, password, password_hash, password_column=password_column, **connection_args):
msg = 'User \'{0}\'@\'{1}\' has been created'.format(user, host)
if not any((password, password_hash)):
msg += ' with passwordless login'

0 comments on commit 6a115f2

Please sign in to comment.