Merge pull request #5 from Oefenweb/consistency-changes

Consistency changes

.ansible-lint

@@ -2,4 +2,4 @@
 warn_list:
   - role-name
   - name[casing]
-  - '401'
+  - latest[git]

.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

meta/main.yml

@@ -1,13 +1,12 @@
 # meta file
 ---
 galaxy_info:
-  namespace: oefenweb
+  author: oefenweb
   role_name: innotop
-  author: Mischa ter Smitten
   company: Oefenweb.nl B.V.
   description: Set up the latest version of innotop 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: "{{ innotop_dependencies }}"
     state: "{{ apt_install_state | default('latest') }}"
     update_cache: true
@@ -13,7 +13,7 @@
     - innotop-install-dependencies
 
 - name: create (checkout) directory
-  file:
+  ansible.builtin.file:
     path: /var/lib/ansible/innotop/checkouts
     state: directory
     owner: root
@@ -25,7 +25,7 @@
     - innotop-checkout
 
 - name: checkout repository
-  git:
+  ansible.builtin.git:
     repo: https://github.com/innotop/innotop.git
     dest: "{{ innotop_checkout_path }}"
     force: true
@@ -35,34 +35,37 @@
     - innotop
     - innotop-checkout
 
-- block:
+- name: install  # noqa no-handler
+  when: _result is changed
+  tags:
+    - configuration
+    - innotop
+  block:
 
     - name: make
-      command: >
+      ansible.builtin.command: >
         perl Makefile.PL
       args:
         chdir: "{{ innotop_checkout_path }}"
+      changed_when: true
       tags:
         - innotop-make
 
     - name: install
-      command: >
+      ansible.builtin.command: >
         make install
       args:
         chdir: "{{ innotop_checkout_path }}"
+      changed_when: true
       tags:
         - innotop-install
 
     - name: cleanup build
-      shell: >
+      ansible.builtin.shell: >
         git reset --hard && git clean -d -x -f
       args:
         chdir: "{{ innotop_checkout_path }}"
         warn: false
+      changed_when: true
       tags:
         - innotop-cleanup-build
-
-  when: _result is changed
-  tags:
-    - configuration
-    - innotop