diff options
| author | Andrew Klychkov <aaklychkov@mail.ru> | 2020-03-03 09:10:52 +0300 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2020-03-03 19:15:41 -0800 |
| commit | 77be6d1b8d3f7d33aa419cc29af5ade8821a9515 (patch) | |
| tree | c056ac22986c070c5fd480fae147996850802ff1 | |
| parent | 6703ffd21d33be077545ef1a3e5b101836479825 (diff) | |
| download | ansible-77be6d1b8d3f7d33aa419cc29af5ade8821a9515.tar.gz | |
mysql_db: partial revert of backport #66998
| -rw-r--r-- | lib/ansible/modules/database/mysql/mysql_user.py | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/ansible/modules/database/mysql/mysql_user.py b/lib/ansible/modules/database/mysql/mysql_user.py index dc0368fa92..34e4327d07 100644 --- a/lib/ansible/modules/database/mysql/mysql_user.py +++ b/lib/ansible/modules/database/mysql/mysql_user.py @@ -232,16 +232,12 @@ VALID_PRIVS = frozenset(('CREATE', 'DROP', 'GRANT', 'GRANT OPTION', 'SUPER', 'ALL', 'ALL PRIVILEGES', 'USAGE', 'REQUIRESSL', 'CREATE ROLE', 'DROP ROLE', 'APPLICATION_PASSWORD_ADMIN', 'AUDIT_ADMIN', 'BACKUP_ADMIN', 'BINLOG_ADMIN', - 'BINLOG_ENCRYPTION_ADMIN', 'CLONE_ADMIN', 'CONNECTION_ADMIN', + 'BINLOG_ENCRYPTION_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', + '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_USER', 'SYSTEM_VARIABLES_ADMIN', 'SYSTEM_USER', - 'TABLE_ENCRYPTION_ADMIN', 'VERSION_TOKEN_ADMIN', - 'XA_RECOVER_ADMIN', 'LOAD FROM S3', 'SELECT INTO S3')) + 'SYSTEM_VARIABLES_ADMIN', 'VERSION_TOKEN_ADMIN', 'XA_RECOVER_ADMIN')) class InvalidPrivsError(Exception): |