From 32dba5411d1908387eaa1a0ff0cf853b838040c6 Mon Sep 17 00:00:00 2001 From: Faustin Lammler Date: Wed, 12 Oct 2022 11:14:17 +0200 Subject: [PATCH] Lint with latest ansible-lint version --- .pre-commit-config.yaml | 13 ++----------- README.md | 4 +--- tasks/databases.yml | 2 +- tasks/main.yml | 32 ++++++++++++++++---------------- tasks/replication_master.yml | 2 +- tasks/users.yml | 2 +- 6 files changed, 22 insertions(+), 33 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 522d635..132d7d0 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,30 +4,21 @@ repos: rev: v4.3.0 hooks: - id: check-added-large-files - - id: check-ast - id: check-case-conflict - id: check-executables-have-shebangs - id: check-merge-conflict - id: check-yaml name: Check yaml files - - id: debug-statements - name: Check for Python debug statements - id: trailing-whitespace name: Check trailing whitespace args: [--markdown-linebreak-ext=md] - - repo: https://gitlab.com/pycqa/flake8.git - rev: 3.9.2 - hooks: - - id: flake8 - name: Check python (flake8) - args: ["--ignore=E501,E226"] - repo: https://github.com/adrienverge/yamllint.git - rev: v1.27.1 + rev: v1.28.0 hooks: - id: yamllint name: Check yaml files (yamllint) - repo: https://github.com/ansible/ansible-lint.git - rev: v6.5.1 + rev: v6.8.1 hooks: - id: ansible-lint name: Check ansible files (ansible-lint) diff --git a/README.md b/README.md index 56d32c2..b5f315d 100644 --- a/README.md +++ b/README.md @@ -84,9 +84,7 @@ variables. This permits more flexibility and a very simple By default, some common and standard options are deployed based on the MariaDB Foundation package. Those default values are only ment as an example and for testing -deployments and you are encouraged to use your own values. This should be -facilitated by extensive use of `raw` variables (see -[`templates/mariadb.cnf.j2`](./templates/mariadb.cnf.j2). +deployments and you are encouraged to use your own values. #### Basic settings diff --git a/tasks/databases.yml b/tasks/databases.yml index b18252a..1707899 100644 --- a/tasks/databases.yml +++ b/tasks/databases.yml @@ -1,6 +1,6 @@ --- - name: Ensure MariaDB databases are present (or absent) - mysql_db: + community.mysql.mysql_db: name: "{{ item.name }}" collation: "{{ item.collation | default('utf8_general_ci') }}" encoding: "{{ item.encoding | default('utf8') }}" diff --git a/tasks/main.yml b/tasks/main.yml index 54320d0..5bfcac5 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -9,39 +9,39 @@ paths: - "vars" -- name: include task setup_debian.yml - import_tasks: setup_debian.yml +- name: Include task setup_debian.yml + ansible.builtin.import_tasks: setup_debian.yml when: ansible_os_family == "Debian" -- name: include task setup_redhat.yml - import_tasks: setup_redhat.yml +- name: Include task setup_redhat.yml + ansible.builtin.import_tasks: setup_redhat.yml when: ansible_os_family == "RedHat" -- name: include task configure.yml - import_tasks: configure.yml +- name: Include task configure.yml + ansible.builtin.import_tasks: configure.yml -- name: include task databases.yml - import_tasks: databases.yml +- name: Include task databases.yml + ansible.builtin.import_tasks: databases.yml when: - mariadb_databases is defined - mariadb_replication_role != "replica" -- name: include task users.yml - import_tasks: users.yml +- name: Include task users.yml + ansible.builtin.import_tasks: users.yml when: - mariadb_users is defined - mariadb_replication_role != "replica" -- name: include task replication_master.yml - import_tasks: replication_master.yml +- name: Include task replication_master.yml + ansible.builtin.import_tasks: replication_master.yml when: mariadb_replication_role == "master" -- name: include task replication_replica.yml - import_tasks: replication_replica.yml +- name: Include task replication_replica.yml + ansible.builtin.import_tasks: replication_replica.yml when: - not ansible_check_mode - mariadb_replication_role == "replica" -- name: include task backup.yml - import_tasks: backup.yml +- name: Include task backup.yml + ansible.builtin.import_tasks: backup.yml when: mariadb_backup_db diff --git a/tasks/replication_master.yml b/tasks/replication_master.yml index 2fb3ee9..40b5bf4 100644 --- a/tasks/replication_master.yml +++ b/tasks/replication_master.yml @@ -1,6 +1,6 @@ --- - name: Ensure replication user exists on master - mysql_user: + community.mysql.mysql_user: name: "{{ item.name }}" host: "{{ item.host | default('%') }}" password: "{{ item.password }}" diff --git a/tasks/users.yml b/tasks/users.yml index 187568a..9611248 100644 --- a/tasks/users.yml +++ b/tasks/users.yml @@ -1,6 +1,6 @@ --- - name: Ensure MariaDB users are present (or absent) - mysql_user: + community.mysql.mysql_user: name: "{{ item.name }}" host: "{{ item.host | default('localhost') }}" password: "{{ item.password }}"