From d24b9d8447de4ad9cacf5640251d23a964e47dbb Mon Sep 17 00:00:00 2001
From: Fanch <fanch@libre.bzh>
Date: Thu, 9 Nov 2023 13:41:40 +0100
Subject: [PATCH] fix from ansible-lint
---
.ansible-lint | 1 +
defaults/main.yml | 3 +--
handlers/main.yml | 2 +-
meta/main.yml | 5 ++---
molecule/default/converge.yml | 18 +++++++++---------
tasks/conf.yml | 17 ++++++++---------
tasks/enable.yml | 1 -
tasks/initdb.yml | 5 ++---
tasks/install.yml | 1 -
tasks/main.yml | 14 +++++---------
tasks/postinstall.yml | 1 -
tasks/upgradedb.yml | 3 +--
12 files changed, 30 insertions(+), 41 deletions(-)
diff --git a/.ansible-lint b/.ansible-lint
index 3ed5d11..ec63976 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -5,3 +5,4 @@ warn_list:
- fqcn-builtins # Use FQCN for builtin actions.
- risky-file-permissions # File permissions unset or incorrect.
- git-latest
+ - no-changed-when
diff --git a/defaults/main.yml b/defaults/main.yml
index b8df29b..bd401fa 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,8 +1,7 @@
---
# defaults file for mariadb
-mariadb_packages: ['mariadb', 'python-pymysql']
-
+mariadb_packages: [mariadb, python-pymysql]
mariadb_disable_tcp: true
mariadb_add_users: []
diff --git a/handlers/main.yml b/handlers/main.yml
index 8814ef6..5c14844 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -7,4 +7,4 @@
state: restarted
- name: Upgrade Mariadb
- include_tasks: tasks/upgradedb.yml
+ ansible.builtin.include_tasks: tasks/upgradedb.yml
diff --git a/meta/main.yml b/meta/main.yml
index f68ba3f..712d858 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -4,12 +4,11 @@ galaxy_info:
role_name: mariadb
namespace: air
author: Fanch The System
- name: mariadb
description: Run mariadb on Archlinux
license: Apache 2.0
- min_ansible_version: 2.10
+ min_ansible_version: 2.13.9
platforms:
- - name: Archlinux
+ - name: ArchLinux
versions:
- all
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index 285c94f..d4eecd7 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -2,15 +2,15 @@
- name: Converge
hosts: all
tasks:
- - name: "Include mariadb"
- include_role:
- name: "air.mariadb"
+ - name: Include mariadb
+ ansible.builtin.include_role:
+ name: air.mariadb
vars:
mariadb_add_users:
- - name: 'alice'
- password: 'easy_pass'
- priv: 'alicedb.*:ALL'
+ - name: alice
+ password: easy_pass
+ priv: alicedb.*:ALL
mariadb_add_dbs:
- - name: 'alicedb'
- encoding: 'utf8mb4'
- collation: 'utf8mb4_general_ci'
+ - name: alicedb
+ encoding: utf8mb4
+ collation: utf8mb4_general_ci
diff --git a/tasks/conf.yml b/tasks/conf.yml
index 2ea3b77..6335623 100644
--- a/tasks/conf.yml
+++ b/tasks/conf.yml
@@ -1,20 +1,19 @@
---
-
- name: Disable Network Access (use only socket)
- lineinfile:
+ ansible.builtin.lineinfile:
path: /etc/my.cnf.d/server.cnf
state: present
- insertafter: '^\[mysqld\]'
- regexp: '^skip-networking'
- line: 'skip-networking'
+ insertafter: ^\[mysqld\]
+ regexp: ^skip-networking
+ line: skip-networking
notify: Restart Mariadb Service
when: mariadb_disable_tcp
- name: Define Transaction Isolation
- lineinfile:
+ ansible.builtin.lineinfile:
path: /etc/my.cnf.d/server.cnf
state: present
- insertafter: '^\[mysqld\]'
- regexp: '^transaction_isolation'
- line: 'transaction_isolation=READ-COMMITTED'
+ insertafter: ^\[mysqld\]
+ regexp: ^transaction_isolation
+ line: transaction_isolation=READ-COMMITTED
notify: Restart Mariadb Service
diff --git a/tasks/enable.yml b/tasks/enable.yml
index 829b618..12451ba 100644
--- a/tasks/enable.yml
+++ b/tasks/enable.yml
@@ -1,5 +1,4 @@
---
-
- name: Enable Mariadb
ansible.builtin.service:
name: mariadb
diff --git a/tasks/initdb.yml b/tasks/initdb.yml
index 5316678..57db8d4 100644
--- a/tasks/initdb.yml
+++ b/tasks/initdb.yml
@@ -1,12 +1,11 @@
---
-
- name: Init Database Cluster
- command: |
+ ansible.builtin.command: |
mariadb-install-db --user=mysql --basedir=/usr --datadir=/var/lib/mysql \
--skip-test-db \
--auth-root-authentication-method=socket
args:
- creates: "/var/lib/mysql/*"
+ creates: /var/lib/mysql/*
# mysql_secure_installation should not be need after 10.4
# https://mariadb.com/kb/en/authentication-from-mariadb-104/
diff --git a/tasks/install.yml b/tasks/install.yml
index 0acd388..4a235ca 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -1,5 +1,4 @@
---
-
- name: Install Packages
ansible.builtin.package:
name: "{{ mariadb_packages }}"
diff --git a/tasks/main.yml b/tasks/main.yml
index c0c3418..15e4c49 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,16 +2,12 @@
# tasks file for mariadb
- name: Install Mariadb
- include_tasks: install.yml
-
+ ansible.builtin.include_tasks: install.yml
- name: Init Database
- include_tasks: initdb.yml
-
+ ansible.builtin.include_tasks: initdb.yml
- name: Local Config
- include_tasks: conf.yml
-
+ ansible.builtin.include_tasks: conf.yml
- name: Enable Service
- include_tasks: enable.yml
-
+ ansible.builtin.include_tasks: enable.yml
- name: Post Install
- include_tasks: postinstall.yml
+ ansible.builtin.include_tasks: postinstall.yml
diff --git a/tasks/postinstall.yml b/tasks/postinstall.yml
index 310d575..9a2fca1 100644
--- a/tasks/postinstall.yml
+++ b/tasks/postinstall.yml
@@ -1,5 +1,4 @@
---
-
# TODO: manage if there are no unix socket
- name: Create Databases
community.mysql.mysql_db:
diff --git a/tasks/upgradedb.yml b/tasks/upgradedb.yml
index 442dfd1..f36595e 100644
--- a/tasks/upgradedb.yml
+++ b/tasks/upgradedb.yml
@@ -1,5 +1,4 @@
---
-
- name: Upgrade databases on major releases
- command: |
+ ansible.builtin.command: |
mariadb-upgrade -u root
--
GitLab