Merge pull request #4 from Oefenweb/consistency-changes

Consistency changes

.ansible-lint

@@ -2,3 +2,4 @@
 warn_list:
   - role-name
   - name[casing]
+  - yaml[comments-indentation]

.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 font cache
-  command: >
+  ansible.builtin.command: >
     fc-cache -f -v

meta/main.yml

@@ -1,13 +1,12 @@
 # meta file
 ---
 galaxy_info:
-  namespace: oefenweb
+  author: oefenweb
   role_name: fonts
-  author: Mischa ter Smitten
   company: Oefenweb.nl B.V.
   description: Set up fonts 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'

molecule/default/converge.yml

@@ -4,8 +4,8 @@
   become: true
   pre_tasks:
     - name: include vars
-      include_vars: "{{ playbook_dir }}/../../tests/vars/_molecule.yml"
-#    - name: include vars
-#     include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml"
+      ansible.builtin.include_vars: "{{ playbook_dir }}/../../tests/vars/_molecule.yml"
+    # - name: include vars
+    #   ansible.builtin.include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml"
   roles:
     - ../../../

molecule/default/prepare.yml

@@ -4,8 +4,8 @@
   become: true
   pre_tasks:
     - name: include vars
-      include_vars: "{{ playbook_dir }}/../../tests/vars/_molecule.yml"
-#    - name: include vars
-#     include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml"
-#    - name: include tasks
-#     include: "{{ playbook_dir }}/../../tests/tasks/pre.yml"
+      ansible.builtin.include_vars: "{{ playbook_dir }}/../../tests/vars/_molecule.yml"
+    # - name: include vars
+    #   ansible.builtin.include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml"
+    # - name: include tasks
+    #   ansible.builtin.import_tasks: "{{ playbook_dir }}/../../tests/tasks/pre.yml"

requirements.yml

@@ -0,0 +1,4 @@
+# requirements file
+---
+collections:
+  - name: ansible.posix

tasks/main.yml

@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: install dependencies
-  apt:
+  ansible.builtin.apt:
     name: "{{ fonts_dependencies }}"
     state: "{{ apt_install_state | default('latest') }}"
     update_cache: true
@@ -12,7 +12,7 @@
     - fonts-dependencies
 
 - name: create (font) directories
-  file:
+  ansible.builtin.file:
     path: "{{ item.dest }}"
     state: directory
     owner: root
@@ -28,7 +28,7 @@
     - fonts-directories-create
 
 - name: remove (font) directories
-  file:
+  ansible.builtin.file:
     path: "{{ item.dest }}"
     state: absent
   with_items: "{{ fonts_font_paths }}"
@@ -42,10 +42,16 @@
     - fonts-directories
     - fonts-directories-remove
 
-- block:
+- name: synchronize
+  tags:
+    - configuration
+    - fonts
+    - fonts-directories
+    - fonts-directories-synchronize
+  block:
 
     - name: synchronize (font) directories (remote)
-      synchronize:
+      ansible.posix.synchronize:
         src: "{{ item.src }}"
         dest: "{{ item.dest }}"
         archive: true
@@ -63,7 +69,7 @@
       notify: update font cache
 
     - name: synchronize (font) directories (local)
-      shell: >
+      ansible.builtin.shell: >
         {{ fonts_rsync_path | default('rsync') }} -ai --delete --no-owner --no-group --exclude=.uuid --checksum {{ item.src }} {{ item.dest }}
       args:
         warn: false
@@ -74,9 +80,3 @@
         - ansible_connection == 'local'
         - (item.state is undefined or item.state == 'present')
       notify: update font cache
-
-  tags:
-    - configuration
-    - fonts
-    - fonts-directories
-    - fonts-directories-synchronize

tests/tasks/pre.yml

@@ -1,13 +1,13 @@
 # pre test file
 ---
 - name: set fact
-  command: >
+  ansible.builtin.command: >
     echo "{{ ansible_connection }}"
   register: _ansible_connection
   changed_when: false
 
 - name: install dependencies
-  apt:
+  ansible.builtin.apt:
     name:
       - wget
       - unzip
@@ -18,7 +18,7 @@
   when: _ansible_connection.stdout != 'ssh'
 
 - name: download font
-  shell: >
+  ansible.builtin.shell: >
     true
     && cd {{ fonts_files_paths }}
     && wget 'https://fonts.google.com/download?family=Ubuntu' -O ubuntu-font-family.zip

tests/test.yml

@@ -5,10 +5,10 @@
   become: true
   pre_tasks:
     - name: include vars
-      include_vars: "{{ playbook_dir }}/vars/_test.yml"
+      ansible.builtin.include_vars: "{{ playbook_dir }}/vars/_test.yml"
     - 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.import_tasks: "{{ playbook_dir }}/tasks/pre.yml"
   roles:
     - ../../

tests/vagrant.yml

@@ -5,10 +5,10 @@
   become: true
   pre_tasks:
     - name: include vars
-      include_vars: "{{ playbook_dir }}/vars/_vagrant.yml"
+      ansible.builtin.include_vars: "{{ playbook_dir }}/vars/_vagrant.yml"
     - 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.import_tasks: "{{ playbook_dir }}/tasks/pre.yml"
   roles:
     - ../../