Merge pull request #3 from Oefenweb/consistency-changes

Consistency changes

Author: tersmitten

.github/workflows/ci.yml

@@ -23,7 +23,9 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies
-        run: pip install ansible-lint[community,yamllint]
+        run: |
+          pip install ansible-lint
+          ansible-galaxy install -r requirements.yml
 
       - name: Lint code
         run: |
@@ -43,11 +45,8 @@ jobs:
       matrix:
         include:
           - distro: debian8
-            ansible-version: '<2.10'
           - distro: debian9
           - distro: debian10
-          - distro: ubuntu1604
-            ansible-version: '>=2.9, <2.10'
           - distro: ubuntu1604
             ansible-version: '>=2.10, <2.11'
           - distro: ubuntu1604

Dockerfile

@@ -1,17 +1,20 @@
-FROM ubuntu:16.04
+FROM ubuntu:18.04
 MAINTAINER Mischa ter Smitten <mtersmitten@oefenweb.nl>
 
+ENV LANG C.UTF-8
+ENV LC_ALL C.UTF-8
+
 # python
 RUN apt-get update && \
-  DEBIAN_FRONTEND=noninteractive apt-get install -y python-minimal python-dev curl && \
+  DEBIAN_FRONTEND=noninteractive apt-get install -y python3-minimal python3-dev curl && \
   apt-get clean
-RUN curl -sL https://bootstrap.pypa.io/pip/2.7/get-pip.py | python -
+RUN curl -sL https://bootstrap.pypa.io/pip/3.6/get-pip.py | python3 -
 RUN rm -rf $HOME/.cache
 
 # ansible
-RUN DEBIAN_FRONTEND=noninteractive apt-get install -y gcc libffi-dev libssl-dev && \
+RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python3-apt && \
   apt-get clean
-RUN pip install ansible==2.9.15
+RUN pip3 install ansible==2.10.7
 RUN rm -rf $HOME/.cache
 
 # provision

README.md

@@ -68,7 +68,7 @@ None
     mariadb_client_my_cnf_files:
       - dest: '~root/.my.cnf'
         owner: root
-        group: root
+        ansible.builtin.group: root
         mode: '0600'
         login_host: localhost
         login_port: 3306

meta/main.yml

@@ -1,13 +1,12 @@
 # meta file
 ---
 galaxy_info:
-  namespace: oefenweb
+  author: oefenweb
   role_name: mariadb_client
-  author: Mischa ter Smitten
   company: Oefenweb.nl B.V.
   description: Set up mariadb-server client in Debian-like systems
   license: MIT
-  min_ansible_version: 2.9.0
+  min_ansible_version: 2.10.0
   platforms:
     - name: Ubuntu
       versions:

molecule/default/collections.yml

@@ -0,0 +1,6 @@
+---
+collections:
+  - name: community.docker
+    version: '>=1.2.0,<2'
+  - name: community.general
+    version: '>=2,<3'

requirements.yml

@@ -0,0 +1,3 @@
+# requirements file
+---
+collections: []

tasks/configure.yml

@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: configure | copy certificate files
-  copy:
+  ansible.builtin.copy:
     src: "{{ item.value.src }}"
     dest: "{{ item.value.dest }}"
     owner: "{{ item.value.owner | default('root') }}"
@@ -12,7 +12,7 @@
     - mariadb-client-configure-copy-certificate-files
 
 - name: configure | update (user) configuration file(s)
-  template:
+  ansible.builtin.template:
     src: root/.my.cnf.j2
     dest: "{{ item.dest | default('~' + item.owner + '/.my.cnf') }}"
     owner: "{{ item.owner }}"

tasks/install.yml

@@ -1,16 +1,16 @@
 # tasks file
 ---
-- name: install | dependencies
-  apt:
+- name: install | dependencies  # noqa args[module]
+  ansible.builtin.apt:
     name: "{{ mariadb_client_dependencies }}"
     state: "{{ apt_install_state | default('latest') }}"
     update_cache: true
     cache_valid_time: "{{ apt_update_cache_valid_time | default(3600) }}"
   tags:
     - mariadb-client-install-dependencies
 
-- name: install | additional
-  apt:
+- name: install | additional  # noqa args[module]
+  ansible.builtin.apt:
     name: "{{ mariadb_client_install }}"
     state: "{{ apt_install_state | default('latest') }}"
   tags:

tasks/main.yml

@@ -1,12 +1,14 @@
 # tasks file
 ---
-- include: install.yml
+- name: install
+  ansible.builtin.import_tasks: install.yml
   tags:
     - configuration
     - mariadb-client
     - mariadb-client-install
 
-- include: configure.yml
+- name: configure
+  ansible.builtin.import_tasks: configure.yml
   tags:
     - configuration
     - mariadb-client