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: |
@@ -42,12 +44,8 @@ jobs:
       fail-fast: false
       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

Vagrantfile

@@ -25,13 +25,6 @@ boxes = [
     :cpu => "50",
     :ram => "384"
   },
-  {
-    :name => "debian-8",
-    :box => "bento/debian-8",
-    :ip => '10.0.0.16',
-    :cpu => "50",
-    :ram => "256"
-  },
   {
     :name => "debian-9",
     :box => "bento/debian-9",

meta/main.yml

@@ -1,13 +1,12 @@
 # meta file
 ---
 galaxy_info:
-  namespace: oefenweb
+  author: oefenweb
   role_name: chrome
-  author: Mischa ter Smitten
   company: Oefenweb.nl B.V.
   description: Set up Google Chrome in Debian-like systems
   license: BSD
-  min_ansible_version: 2.9.0
+  min_ansible_version: 2.10.0
   platforms:
     - name: Ubuntu
       versions:
@@ -16,7 +15,6 @@ galaxy_info:
         - focal
     - name: Debian
       versions:
-        - jessie
         - stretch
         - buster
   galaxy_tags:

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/install.yml

@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: install | dependencies
-  apt:
+  ansible.builtin.apt:
     name: "{{ chrome_dependencies }}"
     state: "{{ apt_install_state | default('latest') }}"
     update_cache: true

tasks/main.yml

@@ -1,12 +1,12 @@
 # tasks file
 ---
-- include: repository.yml
+- ansible.builtin.include: repository.yml
   tags:
     - configuration
     - chrome
     - chrome-repository
 
-- include: install.yml
+- ansible.builtin.include: install.yml
   tags:
     - configuration
     - chrome

tasks/repository.yml

@@ -1,7 +1,7 @@
 # tasks file
 ---
 - name: repository | dependencies
-  apt:
+  ansible.builtin.apt:
     name: "{{ chrome_dependencies_pre }}"
     state: "{{ apt_install_state | default('latest') }}"
     update_cache: true
@@ -10,15 +10,15 @@
     - chrome-repository-dependencies
 
 - name: repository | add public key
-  apt_key:
+  ansible.builtin.apt_key:
     id: A040830F7FAC5991
     url: https://dl-ssl.google.com/linux/linux_signing_key.pub
     state: present
   tags:
     - chrome-repository-public-key
 
 - name: repository | add chrome repository
-  apt_repository:
+  ansible.builtin.apt_repository:
     repo: "{{ item.type }} {{ item.url }} {{ item.component }}"
     state: present
     update_cache: true