Merge pull request geerlingguy#478 from geerlingguy/fix-idempotence

Fix idempotence for Debian 11 and Debian 10 tests

Author: geerlingguy

.github/workflows/ci.yml

@@ -43,10 +43,10 @@ jobs:
         distro:
           - rockylinux8
           - centos7
+          - ubuntu2204
           - ubuntu2004
-          - ubuntu1804
-          - debian10
           - debian11
+          - debian10
 
     steps:
       - name: Check out the codebase.

README.md

@@ -8,59 +8,79 @@ Installs and configures MySQL or MariaDB server on RHEL/CentOS or Debian/Ubuntu
 
 No special requirements; note that this role requires root access, so either run it in a playbook with a global `become: yes`, or invoke the role in your playbook like:
 
-    - hosts: database
-      roles:
-        - role: geerlingguy.mysql
-          become: yes
+```yaml
+- hosts: database
+  roles:
+    - role: geerlingguy.mysql
+      become: yes
+```
 
 ## Role Variables
 
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
-    mysql_user_home: /root
-    mysql_user_name: root
-    mysql_user_password: root
+```yaml
+mysql_user_home: /root
+mysql_user_name: root
+mysql_user_password: root
+```
 
 The home directory inside which Python MySQL settings will be stored, which Ansible will use when connecting to MySQL. This should be the home directory of the user which runs this Ansible role. The `mysql_user_name` and `mysql_user_password` can be set if you are running this role under a non-root user account and want to set a non-root user.
 
-    mysql_root_home: /root
-    mysql_root_username: root
-    mysql_root_password: root
+```yaml
+mysql_root_home: /root
+mysql_root_username: root
+mysql_root_password: root
+```
 
 The MySQL root user account details.
 
-    mysql_root_password_update: false
+```yaml
+mysql_root_password_update: false
+```
 
 Whether to force update the MySQL root user's password. By default, this role will only change the root user's password when MySQL is first configured. You can force an update by setting this to `yes`.
 
 > Note: If you get an error like `ERROR 1045 (28000): Access denied for user 'root'@'localhost' (using password: YES)` after a failed or interrupted playbook run, this usually means the root password wasn't originally updated to begin with. Try either removing  the `.my.cnf` file inside the configured `mysql_user_home` or updating it and setting `password=''` (the insecure default password). Run the playbook again, with `mysql_root_password_update` set to `yes`, and the setup should complete.
 
 > Note: If you get an error like `ERROR 1698 (28000): Access denied for user 'root'@'localhost' (using password: YES)` when trying to log in from the CLI you might need to run as root or sudoer.
 
-    mysql_enabled_on_startup: true
+```yaml
+mysql_enabled_on_startup: true
+```
 
 Whether MySQL should be enabled on startup.
 
-    mysql_config_file: *default value depends on OS*
-    mysql_config_include_dir: *default value depends on OS*
-    
+```yaml
+mysql_config_file: *default value depends on OS*
+mysql_config_include_dir: *default value depends on OS*
+```
+
 The main my.cnf configuration file and include directory.
 
-    overwrite_global_mycnf: true
+```yaml
+overwrite_global_mycnf: true
+```
 
 Whether the global my.cnf should be overwritten each time this role is run. Setting this to `no` tells Ansible to only create the `my.cnf` file if it doesn't exist. This should be left at its default value (`yes`) if you'd like to use this role's variables to configure MySQL.
 
-    mysql_config_include_files: []
+```yaml
+mysql_config_include_files: []
+```
 
 A list of files that should override the default global my.cnf. Each item in the array requires a "src" parameter which is a path to a file. An optional "force" parameter can force the file to be updated each time ansible runs.
 
-    mysql_databases: []
+```yaml
+mysql_databases: []
+```
 
 The MySQL databases to create. A database has the values `name`, `encoding` (defaults to `utf8`), `collation` (defaults to `utf8_general_ci`) and `replicate` (defaults to `1`, only used if replication is configured). The formats of these are the same as in the `mysql_db` module.
 
 You can also delete a database (or ensure it's not on the server) by setting `state` to `absent` (defaults to `present`).
 
-    mysql_users: []
+```yaml
+mysql_users: []
+```
 
 The MySQL users and their privileges. A user has the values:
 
@@ -74,55 +94,71 @@ The MySQL users and their privileges. A user has the values:
 
 The formats of these are the same as in the `mysql_user` module.
 
-    mysql_packages:
-      - mysql
-      - mysql-server
+```yaml
+mysql_packages:
+  - mysql
+  - mysql-server
+```
 
 (OS-specific, RedHat/CentOS defaults listed here) Packages to be installed. In some situations, you may need to add additional packages, like `mysql-devel`.
 
-    mysql_enablerepo: ""
+```yaml
+mysql_enablerepo: ""
+```
 
 (RedHat/CentOS only) If you have enabled any additional repositories (might I suggest geerlingguy.repo-epel or geerlingguy.repo-remi), those repositories can be listed under this variable (e.g. `remi,epel`). This can be handy, as an example, if you want to install later versions of MySQL.
 
-    mysql_python_package_debian: python3-mysqldb
+```yaml
+mysql_python_package_debian: python3-mysqldb
+```
 
 (Ubuntu/Debian only) If you need to explicitly override the MySQL Python package, you can set it here. Set this to `python-mysqldb` if using older distributions running Python 2.
 
-    mysql_port: "3306"
-    mysql_bind_address: '0.0.0.0'
-    mysql_datadir: /var/lib/mysql
-    mysql_socket: *default value depends on OS*
-    mysql_pid_file: *default value depends on OS*
+```yaml
+mysql_port: "3306"
+mysql_bind_address: '0.0.0.0'
+mysql_datadir: /var/lib/mysql
+mysql_socket: *default value depends on OS*
+mysql_pid_file: *default value depends on OS*
+```
 
 Default MySQL connection configuration.
 
-    mysql_log_file_group: mysql *adm on Debian*
-    mysql_log: ""
-    mysql_log_error: *default value depends on OS*
-    mysql_syslog_tag: *default value depends on OS*
+```yaml
+mysql_log_file_group: mysql *adm on Debian*
+mysql_log: ""
+mysql_log_error: *default value depends on OS*
+mysql_syslog_tag: *default value depends on OS*
+```yaml
 
 MySQL logging configuration. Setting `mysql_log` (the general query log) or `mysql_log_error` to `syslog` will make MySQL log to syslog using the `mysql_syslog_tag`.
 
-    mysql_slow_query_log_enabled: false
-    mysql_slow_query_log_file: *default value depends on OS*
-    mysql_slow_query_time: 2
+```yaml
+mysql_slow_query_log_enabled: false
+mysql_slow_query_log_file: *default value depends on OS*
+mysql_slow_query_time: 2
+```
 
 Slow query log settings. Note that the log file will be created by this role, but if you're running on a server with SELinux or AppArmor, you may need to add this path to the allowed paths for MySQL, or disable the mysql profile. For example, on Debian/Ubuntu, you can run `sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/usr.sbin.mysqld && sudo service apparmor restart`.
 
-    mysql_key_buffer_size: "256M"
-    mysql_max_allowed_packet: "64M"
-    mysql_table_open_cache: "256"
-    [...]
+```yaml
+mysql_key_buffer_size: "256M"
+mysql_max_allowed_packet: "64M"
+mysql_table_open_cache: "256"
+...
+```
 
-The rest of the settings in `defaults/main.yml` control MySQL's memory usage and some other common settings. The default values are tuned for a server where MySQL can consume ~512 MB RAM, so you should consider adjusting them to suit your particular server better.
+The rest of the settings in `defaults/main.yml` control MySQL's memory usage and some other common settings. The default values are tuned for a server where MySQL can consume 512 MB RAM, so you should consider adjusting them to suit your particular server better.
 
-    mysql_server_id: "1"
-    mysql_max_binlog_size: "100M"
-    mysql_binlog_format: "ROW"
-    mysql_expire_logs_days: "10"
-    mysql_replication_role: ''
-    mysql_replication_master: ''
-    mysql_replication_user: {}
+```yaml
+mysql_server_id: "1"
+mysql_max_binlog_size: "100M"
+mysql_binlog_format: "ROW"
+mysql_expire_logs_days: "10"
+mysql_replication_role: ''
+mysql_replication_master: ''
+mysql_replication_user: {}
+```
 
 Replication settings. Set `mysql_server_id` and `mysql_replication_role` by server (e.g. the master would be ID `1`, with the `mysql_replication_role` of `master`, and the slave would be ID `2`, with the `mysql_replication_role` of `slave`). The `mysql_replication_user` uses the same keys as individual list items in `mysql_users`, and is created on master servers, and used to replicate on all the slaves.
 

tasks/setup-Debian.yml

@@ -1,6 +1,6 @@
 ---
 - name: Check if MySQL is already installed.
-  stat: path=/etc/init.d/{{ mysql_daemon }}
+  stat: path={{ mysql_config_file }}
   register: mysql_installed
 
 - name: Update apt cache if MySQL is not yet installed.