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: |
@@ -42,12 +44,8 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - distro: ubuntu1604
-            ansible-version: '>=2.9, <2.10'
-            molecule_version: "==3.0.8"
           - distro: ubuntu1604
             ansible-version: '>=2.10, <2.11'
-            molecule_version: "==3.2.4"
           - distro: ubuntu1604
           - distro: ubuntu1804
           - distro: ubuntu2004
@@ -64,7 +62,7 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies
-        run: pip install 'ansible${{ matrix.ansible-version }}' 'molecule[docker]${{ matrix.molecule_version }}' docker
+        run: pip install 'ansible${{ matrix.ansible-version }}' molecule[docker] docker
 
       - name: Run Molecule tests
         run: |

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: haproxy
-  author: Mischa ter Smitten
   company: Oefenweb.nl B.V.
   description: Set up the latest version of HAProxy in Ubuntu 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'

tasks/main.yml

@@ -9,38 +9,38 @@
     - haproxy
     - haproxy-check-version-support
 
-- import_tasks: install.yml
+- ansible.builtin.import_tasks: install.yml
   tags:
     - configuration
     - haproxy
     - haproxy-install
 
-- import_tasks: certificates.yml
+- ansible.builtin.import_tasks: certificates.yml
   tags:
     - configuration
     - haproxy
     - haproxy-certificates
 
-- import_tasks: acl.yml
+- ansible.builtin.import_tasks: acl.yml
   tags:
     - configuration
     - haproxy
     - haproxy-acl
 
-- import_tasks: configuration.yml
+- ansible.builtin.import_tasks: configuration.yml
   tags:
     - configuration
     - haproxy
     - haproxy-configuration
 
-- import_tasks: letsencrypt.yml
+- ansible.builtin.import_tasks: letsencrypt.yml
   tags:
     - configuration
     - haproxy
     - haproxy-letsencrypt
 
 - name: start and enable service
-  ansible.builtin.service:
+  ansible.builtin.ansible.builtin.service:
     name: haproxy
     state: "{{ service_default_state | default('started') }}"
     enabled: "{{ service_default_enabled | default(true) | bool }}"

tests/test.yml

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

tests/vagrant.yml

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