summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndrew Klychkov <aaklychkov@mail.ru>2020-02-11 02:24:12 +0300
committerGitHub <noreply@github.com>2020-02-10 15:24:12 -0800
commitc529c86c1e99b58bd1c769e30ec0c88b3234d3ac (patch)
treeff30e5ca0cde0e931a2ebc993c9b7d640e709d49 /lib
parent5d406cffca4fe84f139ba9714d00ffefe20ec984 (diff)
downloadansible-c529c86c1e99b58bd1c769e30ec0c88b3234d3ac.tar.gz
Backport of 66995: mysql_user doesnt support privileges with underscore (#66998)
Diffstat (limited to 'lib')
-rw-r--r--lib/ansible/modules/database/mysql/mysql_user.py24
1 files changed, 15 insertions, 9 deletions
diff --git a/lib/ansible/modules/database/mysql/mysql_user.py b/lib/ansible/modules/database/mysql/mysql_user.py
index b5c7cf0f3e..dc0368fa92 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,18 @@ 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', 'CLONE_ADMIN', 'CONNECTION_ADMIN',
+ 'ENCRYPTION_KEY_ADMIN', 'FIREWALL_ADMIN', 'FIREWALL_USER',
+ 'GROUP_REPLICATION_ADMIN', 'INNODB_REDO_LOG_ARCHIVE',
+ 'NDB_STORED_USER', 'PERSIST_RO_VARIABLES_ADMIN',
+ 'REPLICATION_APPLIER', 'REPLICATION_SLAVE_ADMIN',
+ 'RESOURCE_GROUP_ADMIN', 'RESOURCE_GROUP_USER',
+ 'ROLE_ADMIN', 'SESSION_VARIABLES_ADMIN', 'SET_USER_ID',
+ 'SYSTEM_USER', 'SYSTEM_VARIABLES_ADMIN', 'SYSTEM_USER',
+ 'TABLE_ENCRYPTION_ADMIN', 'VERSION_TOKEN_ADMIN',
+ 'XA_RECOVER_ADMIN', 'LOAD FROM S3', 'SELECT INTO S3'))
class InvalidPrivsError(Exception):