From 35434f9672f3121549f6a88358ed73a696e94d4f Mon Sep 17 00:00:00 2001
From: Solomon Gifford <sgifford@blackmesh.com>
Date: Fri, 20 Feb 2015 12:30:27 -0500
Subject: [PATCH] mysql_user #829: add update_password to mysql_user
---
database/mysql/mysql_user.py | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/database/mysql/mysql_user.py b/database/mysql/mysql_user.py
index 3590fb8e640..a9b7b222072 100644
--- a/database/mysql/mysql_user.py
+++ b/database/mysql/mysql_user.py
@@ -93,6 +93,14 @@ options:
required: false
default: false
version_added: "1.3"
+ update_password:
+ required: false
+ default: always
+ choices: ['always', 'on_create']
+ version_added: "1.9"
+ description:
+ - C(always) will update passwords if they differ. C(on_create) will only set the password for newly created users.
+
notes:
- Requires the MySQLdb Python package on the remote host. For Ubuntu, this
is as easy as apt-get install python-mysqldb.
@@ -446,6 +454,7 @@ def main():
priv=dict(default=None),
append_privs=dict(type="bool", default="no"),
check_implicit_admin=dict(default=False),
+ update_password=dict(default="always", choices=["always", "on_create"]),
)
)
user = module.params["user"]
@@ -455,6 +464,7 @@ def main():
priv = module.params["priv"]
check_implicit_admin = module.params['check_implicit_admin']
append_privs = module.boolean(module.params["append_privs"])
+ update_password = module.params['update_password']
if not mysqldb_found:
module.fail_json(msg="the python mysqldb module is required")
@@ -497,7 +507,11 @@ def main():
if state == "present":
if user_exists(cursor, user, host):
try:
- changed = user_mod(cursor, user, host, password, priv, append_privs)
+ if update_password == 'always':
+ changed = user_mod(cursor, user, host, password, priv, append_privs)
+ else:
+ changed = user_mod(cursor, user, host, None, priv, append_privs)
+
except (SQLParseError, InvalidPrivsError, MySQLdb.Error), e:
module.fail_json(msg=str(e))
else: