From 54bff54e453d74d397ed6e929163b797be4b88ea Mon Sep 17 00:00:00 2001 From: Faustin Lammler Date: Thu, 25 Jun 2020 12:43:02 +0200 Subject: [PATCH] Apply babafou review - useless use of double quotes; - missing task name; - loop replaces with_items; - use import_tasks instead of include_tasks see: https://www.reddit.com/r/ansible/comments/8rrybk/why_choosing_import_over_include_is_it_faster/e0txxoy/ https://docs.ansible.com/ansible/2.5/porting_guides/porting_guide_2.5.html#dynamic-includes-and-attribute-inheritance --- README.md | 38 +++++++++++++++++------------------ defaults/main.yml | 28 +++++++++++++------------- meta/main.yml | 2 +- tasks/configure.yml | 5 ++--- tasks/main.yml | 14 ++++++------- tasks/replication_replica.yml | 4 ++-- tasks/users.yml | 2 +- 7 files changed, 46 insertions(+), 47 deletions(-) diff --git a/README.md b/README.md index 983ffa7..ee62233 100644 --- a/README.md +++ b/README.md @@ -37,8 +37,8 @@ Available variables are listed below, along with default values (see ```yaml mariadb_use_official_repo: false -mariadb_use_official_repo_url: "http://ftp.igh.cnrs.fr/pub/mariadb/repo" -mariadb_use_official_repo_version: "10.4" +mariadb_use_official_repo_url: http://ftp.igh.cnrs.fr/pub/mariadb/repo +mariadb_use_official_repo_version: 10.4 ``` You may deploy the MariaDB Server version that comes with your distribution (Debian/Ubuntu) or @@ -71,11 +71,11 @@ Foundation package and it should be easy to change them all (see #### Basic settings ```yaml -mariadb_config_file: "/etc/mysql/my.cnf" -mariadb_datadir: "/var/lib/mysql" -mariadb_port: "3306" -mariadb_bind_address: "127.0.0.1" -mariadb_unix_socket: "/run/mysqld/mysqld.sock" +mariadb_config_file: /etc/mysql/my.cnf +mariadb_datadir: /var/lib/mysql +mariadb_port: 3306 +mariadb_bind_address: 127.0.0.1 +mariadb_unix_socket: /run/mysqld/mysqld.sock ``` ```yaml @@ -199,19 +199,19 @@ mariadb_replication_user: [] #### Master variables ```yaml -mariadb_replication_role: "master" -mariadb_server_id: "1" -mariadb_max_binlog_size: "100M" -mariadb_binlog_format: "MIXED" -mariadb_expire_logs_days: "10" +mariadb_replication_role: master +mariadb_server_id: 1 +mariadb_max_binlog_size: 100M +mariadb_binlog_format: MIXED +mariadb_expire_logs_days: 10 ``` #### Replica variables ```yaml -mariadb_replication_role: "replica" -mariadb_server_id: "1" -mariadb_replication_master_ip: "IP" +mariadb_replication_role: replica +mariadb_server_id: 1 +mariadb_replication_master_ip: IP ``` ### Backups (optional) @@ -219,10 +219,10 @@ mariadb_replication_master_ip: "IP" ```yaml # db dumps backup mariadb_backup_db: false -mariadb_backup_db_cron_min: "50" -mariadb_backup_db_cron_hour: "00" -mariadb_backup_db_dir: "/mnt/backup" -mariadb_backup_db_rotation: "15" +mariadb_backup_db_cron_min: 50 +mariadb_backup_db_cron_hour: 00 +mariadb_backup_db_dir: /mnt/backup +mariadb_backup_db_rotation: 15 # name of the database to dump # (mandatory if mariadb_backup_db is set to true) diff --git a/defaults/main.yml b/defaults/main.yml index d4ba4ae..02d9ab1 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -2,8 +2,8 @@ # Configure the following to use official MariaDB repository # see: https://downloads.mariadb.org/mariadb/repositories mariadb_use_official_repo: false -mariadb_use_official_repo_url: "http://ftp.igh.cnrs.fr/pub/mariadb/repo" -mariadb_use_official_repo_version: "10.4" +mariadb_use_official_repo_url: http://ftp.igh.cnrs.fr/pub/mariadb/repo +mariadb_use_official_repo_version: 10.4 mariadb_enabled_on_startup: true # The following is set to true by default but you may consider setting it to @@ -16,10 +16,10 @@ mariadb_overwrite_global_config_file: true # MariaDB configuration file mariadb_config_file: /etc/mysql/my.cnf # Basic settings -mariadb_datadir: "/var/lib/mysql" -mariadb_port: "3306" -mariadb_bind_address: "127.0.0.1" -mariadb_unix_socket: "/run/mysqld/mysqld.sock" +mariadb_datadir: /var/lib/mysql +mariadb_port: 3306 +mariadb_bind_address: 127.0.0.1 +mariadb_unix_socket: /run/mysqld/mysqld.sock mariadb_basic_settings_raw: | user = mysql pid-file = /run/mysqld/mysqld.pid @@ -86,11 +86,11 @@ mariadb_users: [] # Replication # replication is only enabled if mariadb_replication_role has values -mariadb_replication_role: "" # master|replica +mariadb_replication_role: "" mariadb_replication_master_ip: "" -mariadb_max_binlog_size: "100M" -mariadb_binlog_format: "MIXED" -mariadb_expire_logs_days: "10" +mariadb_max_binlog_size: 100M +mariadb_binlog_format: MIXED +mariadb_expire_logs_days: 10 # Replication users # same keys as mariadb_users above @@ -99,10 +99,10 @@ mariadb_replication_user: [] # Backups mariadb_backup_db: false -mariadb_backup_db_cron_min: "50" -mariadb_backup_db_cron_hour: "00" -mariadb_backup_db_dir: "/opt/backup" -mariadb_backup_db_rotation: "15" +mariadb_backup_db_cron_min: 50 +mariadb_backup_db_cron_hour: 00 +mariadb_backup_db_dir: /opt/backup +mariadb_backup_db_rotation: 15 # DB to backup mariadb_backup_db_name: [] diff --git a/meta/main.yml b/meta/main.yml index b136bd4..9d9469f 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -5,7 +5,7 @@ galaxy_info: author: fauust role_name: mariadb description: MariaDB server for Debian/Ubuntu. - license: "license GPL-3.0-only" + license: license GPL-3.0-only min_ansible_version: 2.8 platforms: - name: Debian diff --git a/tasks/configure.yml b/tasks/configure.yml index e702749..cf32810 100644 --- a/tasks/configure.yml +++ b/tasks/configure.yml @@ -23,6 +23,5 @@ state: started enabled: "{{ mariadb_enabled_on_startup }}" -# immediately restart mariadb -# this is necessary for replication setup -- meta: flush_handlers +- name: Immediately restart MariaDB (necessary for replication) + meta: flush_handlers diff --git a/tasks/main.yml b/tasks/main.yml index 3c85571..093845b 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,32 +1,32 @@ --- - name: include task setup.yml - include_tasks: setup.yml + import_tasks: setup.yml - name: include task configure.yml - include_tasks: configure.yml + import_tasks: configure.yml - name: include task databases.yml - include_tasks: databases.yml + import_tasks: databases.yml when: - mariadb_databases is defined - mariadb_replication_role != "replica" - name: include task users.yml - include_tasks: users.yml + import_tasks: users.yml when: - mariadb_users is defined - mariadb_replication_role != "replica" - name: include task replication_master.yml - include_tasks: replication_master.yml + import_tasks: replication_master.yml when: mariadb_replication_role == "master" - name: include task replication_replica.yml - include_tasks: replication_replica.yml + import_tasks: replication_replica.yml when: - not ansible_check_mode - mariadb_replication_role == "replica" - name: include task backup.yml - include_tasks: backup.yml + import_tasks: backup.yml when: mariadb_backup_db diff --git a/tasks/replication_replica.yml b/tasks/replication_replica.yml index 5a6861c..c0eff58 100644 --- a/tasks/replication_replica.yml +++ b/tasks/replication_replica.yml @@ -13,7 +13,7 @@ command: | /usr/bin/mariadb -e "CHANGE MASTER TO master_host='{{ mariadb_replication_master_ip }}', master_user='{{ item.name }}', master_password='{{ item.password }}', master_use_gtid=slave_pos" - with_items: "{{ mariadb_replication_user }}" + loop: "{{ mariadb_replication_user }}" when: - not replica.Is_Slave no_log: true @@ -27,7 +27,7 @@ # master_password: "{{ item.password }}" # master_use_gtid: "{{ mariadb_replication_gtid | default('slave_pos') }} # login_unix_socket: "{{ mariadb_unix_socket }}" -# with_items: "{{ mariadb_replication_user }}" +# loop: "{{ mariadb_replication_user }}" # when: # - not replica.Is_Slave # no_log: true diff --git a/tasks/users.yml b/tasks/users.yml index 2acc735..187568a 100644 --- a/tasks/users.yml +++ b/tasks/users.yml @@ -9,5 +9,5 @@ append_privs: "{{ item.append_privs | default('no') }}" encrypted: "{{ item.encrypted | default('no') }}" login_unix_socket: "{{ mariadb_unix_socket }}" - with_items: "{{ mariadb_users }}" + loop: "{{ mariadb_users }}" no_log: true