diff options
| author | Andrew Klychkov <aaklychkov@mail.ru> | 2020-03-04 06:16:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-03 19:16:35 -0800 |
| commit | a824c02ae4778b1f06354eb40f388ed79d6f6860 (patch) | |
| tree | 3146e10ff54af8a4e7874610c33ed0a1a3d3b912 | |
| parent | 9e4bd9b08b9a16ad65b9909dfcac81484c4064b0 (diff) | |
| download | ansible-a824c02ae4778b1f06354eb40f388ed79d6f6860.tar.gz | |
Backport of 66995: mysql_user doesnt support privileges with underscore (#66999)
* Backport of 66995: mysql_user doesnt support privileges with underscore
* fix
| -rw-r--r-- | changelogs/fragments/66974-mysql_user_doesnt_support_privs_with_underscore.yml | 2 | ||||
| -rw-r--r-- | lib/ansible/modules/database/mysql/mysql_user.py | 20 |
2 files changed, 13 insertions, 9 deletions
diff --git a/changelogs/fragments/66974-mysql_user_doesnt_support_privs_with_underscore.yml b/changelogs/fragments/66974-mysql_user_doesnt_support_privs_with_underscore.yml new file mode 100644 index 0000000000..95af3a2062 --- /dev/null +++ b/changelogs/fragments/66974-mysql_user_doesnt_support_privs_with_underscore.yml @@ -0,0 +1,2 @@ +bugfixes: +- mysql_user - fix support privileges with underscore (https://github.com/ansible/ansible/issues/66974). diff --git a/lib/ansible/modules/database/mysql/mysql_user.py b/lib/ansible/modules/database/mysql/mysql_user.py index 50118f9010..fe083ded40 100644 --- a/lib/ansible/modules/database/mysql/mysql_user.py +++ b/lib/ansible/modules/database/mysql/mysql_user.py @@ -108,6 +108,9 @@ seealso: - name: MySQL access control and account management reference description: Complete reference of the MySQL access control and account management documentation. link: https://dev.mysql.com/doc/refman/8.0/en/access-control.html +- name: MySQL provided privileges reference + description: Complete reference of the MySQL provided privileges documentation. + link: https://dev.mysql.com/doc/refman/8.0/en/privileges-provided.html author: - Jonathan Mainguy (@Jmainguy) @@ -227,15 +230,14 @@ VALID_PRIVS = frozenset(('CREATE', 'DROP', 'GRANT', 'GRANT OPTION', 'PROCESS', 'PROXY', 'RELOAD', 'REPLICATION CLIENT', 'REPLICATION SLAVE', 'SHOW DATABASES', 'SHUTDOWN', 'SUPER', 'ALL', 'ALL PRIVILEGES', 'USAGE', 'REQUIRESSL', - 'CREATE ROLE', 'DROP ROLE', 'APPLICATION PASSWORD ADMIN', - 'AUDIT ADMIN', 'BACKUP ADMIN', 'BINLOG ADMIN', - 'BINLOG ENCRYPTION ADMIN', 'CONNECTION ADMIN', - 'ENCRYPTION KEY ADMIN', 'FIREWALL ADMIN', 'FIREWALL USER', - 'GROUP REPLICATION ADMIN', 'PERSIST RO VARIABLES ADMIN', - 'REPLICATION SLAVE ADMIN', 'RESOURCE GROUP ADMIN', - 'RESOURCE GROUP USER', 'ROLE ADMIN', 'SET USER ID', - 'SESSION VARIABLES ADMIN', 'SYSTEM VARIABLES ADMIN', - 'VERSION TOKEN ADMIN', 'XA RECOVER ADMIN')) + 'CREATE ROLE', 'DROP ROLE', 'APPLICATION_PASSWORD_ADMIN', + 'AUDIT_ADMIN', 'BACKUP_ADMIN', 'BINLOG_ADMIN', + 'BINLOG_ENCRYPTION_ADMIN', 'CONNECTION_ADMIN', + 'ENCRYPTION_KEY_ADMIN', 'FIREWALL_ADMIN', 'FIREWALL_USER', + 'GROUP_REPLICATION_ADMIN', 'PERSIST_RO_VARIABLES_ADMIN', + 'REPLICATION_SLAVE_ADMIN', 'RESOURCE_GROUP_ADMIN', 'RESOURCE_GROUP_USER', + 'ROLE_ADMIN', 'SESSION_VARIABLES_ADMIN', 'SET_USER_ID', + 'SYSTEM_VARIABLES_ADMIN', 'VERSION_TOKEN_ADMIN', 'XA_RECOVER_ADMIN')) class InvalidPrivsError(Exception): |