diff --git a/.ansible-lint b/.ansible-lint index 3ed5d11d21e3020c78acd75bd5c7e0a2230af0a2..ec63976accba62e1fe209867db5bd6cf019128b3 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 b8df29b79439dd29cd98bad41795d11d8b3dc517..bd401fa6dd3a4b25be8b2d51baf4ca0e651ef406 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 8814ef6cbbf49c8a9ecb79d4ad0680c65f43ab93..5c14844cde3879bb815875bb5ee195f69dea7062 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 f68ba3f831e1663fb19069bdee5e5392078b040b..712d8587011f5a19c1cc8361b286ec2fee5320b6 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 285c94fc00c5dcff006039b83e989b40a8a0fae5..d4eecd7de7e1c374293bc315c280efb656da541b 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 2ea3b7725027d78670748624ddbdce07338d8cb6..6335623385b57dce46cefe94da545aff280fbc10 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 829b618d7dab63d0332e2e76073cd4387cdcf5ee..12451badb1d602aaf54a15e22152bf4a72423d4d 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 531667877bed203d568ebec04ac099ece251c0cd..57db8d4ec6effd010a787784c0d2aa5ecc29b897 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 0acd388cf178a78c256862ed203c67ee6028cc82..4a235ca92f40db66ddb11c95307423fd10b2d441 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 c0c341828eddbc55c1fc264edf4fee2bec2ebf13..15e4c49d5b36b0ca93101d6569401451984f3c67 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 310d575a623d90c3e5aaba65762bbf97df1e86eb..9a2fca17f09aab3034376d1b08270037ed57eaac 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 442dfd17be33cb6e1ad8928d2033ce849dda3807..f36595ecd8be1689ec2602965baefbfe2e045b13 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