Consistency changes

.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 <[email protected]>
 
+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

handlers/main.yml

@@ -1,5 +1,5 @@
 # handlers file
 ---
 - name: update ca-certificates
-  command: >
+  ansible.builtin.command: >
     update-ca-certificates

meta/main.yml

@@ -1,13 +1,12 @@
 # meta file
 ---
 galaxy_info:
-  namespace: oefenweb
+  author: oefenweb
   role_name: ca_certificates
-  author: Mischa ter Smitten
   company: Oefenweb.nl B.V.
   description: Manage ca-certificates 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/main.yml

@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: install dependencies
-  apt:
+  ansible.builtin.apt:
     name: "{{ ca_certificates_dependencies }}"
     state: "{{ apt_install_state | default('latest') }}"
     update_cache: true
@@ -13,7 +13,7 @@
     - ca-certificates-install-dependencies
 
 - name: stat directories
-  stat:
+  ansible.builtin.stat:
     path: "{{ ca_certificates_base_dir }}/{{ item.dest | dirname }}"
   register: _stat_directories
   with_items: "{{ ca_certificates_certificate_map }}"
@@ -24,7 +24,7 @@
     - ca-certificates-directories-stat
 
 - name: create directories
-  file:
+  ansible.builtin.file:
     path: "{{ ca_certificates_base_dir }}/{{ item.item.dest | dirname }}"
     state: directory
     owner: root
@@ -39,7 +39,7 @@
     - ca-certificates-directories-create
 
 - name: copy ca files
-  copy:
+  ansible.builtin.copy:
     src: "{{ item.src }}"
     dest: "{{ ca_certificates_base_dir }}/{{ item.dest }}"
     owner: "{{ item.owner | default('root') }}"
@@ -54,7 +54,7 @@
     - ca-certificates-files-copy
 
 - name: trust ca files
-  lineinfile:
+  ansible.builtin.lineinfile:
     dest: "{{ ca_certificates_trust_file }}"
     line: "{{ item.dest }}"
   with_items: "{{ ca_certificates_certificate_map }}"

tests/tasks/pre.yml

@@ -1,7 +1,7 @@
 # pre test file
 ---
 - name: install dependencies
-  apt:
+  ansible.builtin.apt:
     name:
       - openssl
     state: "{{ apt_install_state | default('latest') }}"
@@ -11,13 +11,13 @@
 - block:
 
     - name: generate key
-      command: >
+      ansible.builtin.command: >
         openssl genrsa -out {{ ca_certificates_certificate_key_file }} 2048
       args:
         creates: "{{ ca_certificates_certificate_key_file }}"
 
     - name: generate crt
-      shell: >
+      ansible.builtin.shell: >
         openssl req \
           -subj '/C=NL/ST=NH/L=Amsterdam/O=Oefenweb.nl B.V./OU=Systeembeheer/CN=oefenweb.nl/[email protected]/' \
           -x509 -new -nodes \

tests/test.yml

@@ -5,8 +5,8 @@
   become: true
   pre_tasks:
     - name: include vars
-      include_vars: "{{ playbook_dir }}/vars/main.yml"
+      ansible.builtin.include_vars: "{{ playbook_dir }}/vars/main.yml"
     - name: include tasks
-      include: "{{ playbook_dir }}/tasks/pre.yml"
+      ansible.builtin.include: "{{ playbook_dir }}/tasks/pre.yml"
   roles:
     - ../../

tests/vagrant.yml

@@ -5,8 +5,8 @@
   become: true
   pre_tasks:
     - name: include vars
-      include_vars: "{{ playbook_dir }}/vars/main.yml"
+      ansible.builtin.include_vars: "{{ playbook_dir }}/vars/main.yml"
     - name: include tasks
-      include: "{{ playbook_dir }}/tasks/pre.yml"
+      ansible.builtin.include: "{{ playbook_dir }}/tasks/pre.yml"
   roles:
     - ../../