extend role check

Signed-off-by: Martin Schurz <[email protected]>

roles/mysql_hardening/tasks/mysql_secure_installation.yml

@@ -55,10 +55,6 @@
     login_unix_socket: "{{ login_unix_socket | default(omit) }}"
   register: mysql_role_support
   check_mode: false
-  when: >
-    (mysql_distribution == "mysql" and mysql_version.version.full is version('5.7.6', '>=')) or
-    (mysql_distribution == "mariadb" and mysql_version.version.full
-    is version('10.4.0', '>='))
 
 - name: Get all users that have no authentication_string on MySQL version >= 5.7.6 or Mariadb version >= 10.4.0
   community.mysql.mysql_query:
@@ -70,7 +66,7 @@
         AND USER NOT IN ('mysql.sys',
                          'mysqlxsys',
                          'mariadb.sys')
-      {{ 'AND is_role = "N"' if mysql_role_support.rowcount[0] > 0 }};
+        {{ 'AND is_role = "N"' if mysql_role_support.rowcount[0] > 0 }};
     login_unix_socket: "{{ login_unix_socket | default(omit) }}"
   register: mysql_users_wo_passwords_or_auth_string
   check_mode: false
@@ -90,7 +86,8 @@
              OR authentication_string="")
         AND USER NOT IN ('mysql.sys',
                          'mysqlxsys',
-                         'mariadb.sys');
+                         'mariadb.sys')
+        {{ 'AND is_role = "N"' if mysql_role_support.rowcount[0] > 0 }};
     login_unix_socket: "{{ login_unix_socket | default(omit) }}"
   register: mysql_users_wo_passwords
   check_mode: false