Bump ansible-lint from 4.3.7 to 5.0.4 in /.github/workflows/requirements (#377)

.github/workflows/molecule.yml

@@ -19,17 +19,9 @@ jobs:
       matrix:
         scenario:
           - default
-          - default_alpine
-          - default_centos
           - module
-          - module_alpine
-          - module_centos
           - plus
-          - plus_alpine
-          - plus_centos
           - source
-          - source_alpine
-          - source_centos
     steps:
       - name: Check out the codebase
         if: "!(contains(matrix.scenario, 'plus') && github.event.pull_request.head.repo.full_name != github.repository)"

.github/workflows/requirements/requirements_molecule.txt

@@ -1,5 +1,5 @@
 ansible-base==2.10.7
-ansible-lint==4.3.7
+ansible-lint==5.0.4
 yamllint==1.26.0
 molecule[docker]==3.2.4
 docker==4.4.4

CHANGELOG.md

@@ -15,7 +15,8 @@ ENHANCEMENTS:
 *   Specify GitHub actions Ubuntu release.
 *   Minor GitHub template tweaks, including the creation of a SECURITY doc.
 *   Update list of supported platforms.
-*   Update Ansible base to `2.10.7`, Molecule to `3.2.4`, yamllint to `1.26.0` and Docker Python SDK to `4.4.4`.
+*   Update Ansible base to `2.10.7`, Ansible Lint to `5.0.4`, Molecule to `3.2.4`, yamllint to `1.26.0` and Docker Python SDK to `4.4.4`.
+*   Consolidate Molecule testing scenarios to address changes introduced in Ansible Lint `5.*`.
 *   Override of systemd `Restart` value by using proper `nginx_service_restart` variable.
 
 BUG FIXES:

meta/main.yml

@@ -3,6 +3,7 @@ galaxy_info:
   author: Alessandro Fael Garcia
   description: Official Ansible role for NGINX
   role_name: nginx
+  namespace: nginxinc  # Ansible Lint requirement
   company: F5 Networks, Inc.
 
   license: Apache License, Version 2.0

molecule/default/molecule.yml

@@ -6,6 +6,41 @@ lint: |
   yamllint .
   ansible-lint --force-color
 platforms:
+  - name: alpine-3.10
+    image: alpine:3.10
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+  - name: alpine-3.11
+    image: alpine:3.11
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+  - name: alpine-3.12
+    image: alpine:3.12
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+  - name: centos-7
+    image: centos:7
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/usr/sbin/init"
+  - name: centos-8
+    image: centos:8
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/usr/sbin/init"
   - name: debian-stretch
     image: debian:stretch-slim
     dockerfile: ../common/Dockerfile.j2
@@ -44,5 +79,5 @@ platforms:
 provisioner:
   name: ansible
   playbooks:
-    converge: ../common/playbooks/default_converge.yml
-    verify: ../common/playbooks/default_verify.yml
+    converge: converge.yml
+    verify: verify.yml

molecule/default_alpine/molecule.yml

@@ -1,34 +0,0 @@
----
-driver:
-  name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint --force-color
-platforms:
-  - name: alpine-3.10
-    image: alpine:3.10
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
-  - name: alpine-3.11
-    image: alpine:3.11
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
-  - name: alpine-3.12
-    image: alpine:3.12
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
-provisioner:
-  name: ansible
-  playbooks:
-    converge: ../common/playbooks/default_converge.yml
-    verify: ../common/playbooks/default_verify.yml

molecule/default_centos/molecule.yml

@@ -1,27 +0,0 @@
----
-driver:
-  name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint --force-color
-platforms:
-  - name: centos-7
-    image: centos:7
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/usr/sbin/init"
-  - name: centos-8
-    image: centos:8
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/usr/sbin/init"
-provisioner:
-  name: ansible
-  playbooks:
-    converge: ../common/playbooks/default_converge.yml
-    verify: ../common/playbooks/default_verify.yml

molecule/module/molecule.yml

@@ -6,6 +6,41 @@ lint: |
   yamllint .
   ansible-lint --force-color
 platforms:
+  - name: alpine-3.10
+    image: alpine:3.10
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+  - name: alpine-3.11
+    image: alpine:3.11
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+  - name: alpine-3.12
+    image: alpine:3.12
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+  - name: centos-7
+    image: centos:7
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/usr/sbin/init"
+  - name: centos-8
+    image: centos:8
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/usr/sbin/init"
   - name: debian-stretch
     image: debian:stretch-slim
     dockerfile: ../common/Dockerfile.j2
@@ -44,5 +79,5 @@ platforms:
 provisioner:
   name: ansible
   playbooks:
-    converge: ../common/playbooks/module_converge.yml
-    verify: ../common/playbooks/module_verify.yml
+    converge: converge.yml
+    verify: verify.yml

molecule/module_alpine/molecule.yml

@@ -1,34 +0,0 @@
----
-driver:
-  name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint --force-color
-platforms:
-  - name: alpine-3.10
-    image: alpine:3.10
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
-  - name: alpine-3.11
-    image: alpine:3.11
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
-  - name: alpine-3.12
-    image: alpine:3.12
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
-provisioner:
-  name: ansible
-  playbooks:
-    converge: ../common/playbooks/module_converge.yml
-    verify: ../common/playbooks/module_verify.yml

molecule/module_centos/molecule.yml

@@ -1,27 +0,0 @@
----
-driver:
-  name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint --force-color
-platforms:
-  - name: centos-7
-    image: centos:7
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/usr/sbin/init"
-  - name: centos-8
-    image: centos:8
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/usr/sbin/init"
-provisioner:
-  name: ansible
-  playbooks:
-    converge: ../common/playbooks/module_converge.yml
-    verify: ../common/playbooks/module_verify.yml

molecule/plus/molecule.yml

@@ -6,6 +6,41 @@ lint: |
   yamllint .
   ansible-lint --force-color
 platforms:
+  - name: alpine-3.10
+    image: python:alpine3.10
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+  - name: alpine-3.11
+    image: python:alpine3.11
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+  - name: alpine-3.12
+    image: alpine:3.12
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+  - name: centos-7
+    image: centos:7
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/usr/sbin/init"
+  - name: centos-8
+    image: centos:8
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/usr/sbin/init"
   - name: debian-stretch
     image: debian:stretch-slim
     dockerfile: ../common/Dockerfile.j2
@@ -44,6 +79,6 @@ platforms:
 provisioner:
   name: ansible
   playbooks:
-    prepare: ../common/playbooks/plus_prepare.yml
-    converge: ../common/playbooks/plus_converge.yml
-    verify: ../common/playbooks/plus_verify.yml
+    prepare: prepare.yml
+    converge: converge.yml
+    verify: verify.yml

molecule/plus/prepare.yml

@@ -6,13 +6,13 @@
     - name: Create ephemeral license certificate file from b64 decoded env var
       copy:
         content: "{{ lookup('env','NGINX_CRT') | b64decode }}"
-        dest: ../../../files/license/nginx-repo.crt
+        dest: ../../files/license/nginx-repo.crt
         force: no
         mode: 0444
 
     - name: Create ephemeral license key file from b64 decoded env var
       copy:
         content: "{{ lookup('env','NGINX_KEY') | b64decode }}"
-        dest: ../../../files/license/nginx-repo.key
+        dest: ../../files/license/nginx-repo.key
         force: no
         mode: 0444

molecule/plus_alpine/molecule.yml

@@ -1,35 +0,0 @@
----
-driver:
-  name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint --force-color
-platforms:
-  - name: alpine-3.10
-    image: python:alpine3.10
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
-  - name: alpine-3.11
-    image: python:alpine3.11
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
-  - name: alpine-3.12
-    image: alpine:3.12
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
-provisioner:
-  name: ansible
-  playbooks:
-    prepare: ../common/playbooks/plus_prepare.yml
-    converge: ../common/playbooks/plus_converge.yml
-    verify: ../common/playbooks/plus_verify.yml

molecule/plus_centos/molecule.yml

@@ -1,28 +0,0 @@
----
-driver:
-  name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint --force-color
-platforms:
-  - name: centos-7
-    image: centos:7
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/usr/sbin/init"
-  - name: centos-8
-    image: centos:8
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/usr/sbin/init"
-provisioner:
-  name: ansible
-  playbooks:
-    prepare: ../common/playbooks/plus_prepare.yml
-    converge: ../common/playbooks/plus_converge.yml
-    verify: ../common/playbooks/plus_verify.yml

molecule/source/molecule.yml

@@ -6,6 +6,41 @@ lint: |
   yamllint .
   ansible-lint --force-color
 platforms:
+  - name: alpine-3.10
+    image: alpine:3.10
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+  - name: alpine-3.11
+    image: alpine:3.11
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+  - name: alpine-3.12
+    image: alpine:3.12
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/sbin/init"
+  - name: centos-7
+    image: centos:7
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/usr/sbin/init"
+  - name: centos-8
+    image: centos:8
+    dockerfile: ../common/Dockerfile.j2
+    privileged: true
+    volumes:
+      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
+    command: "/usr/sbin/init"
   - name: debian-stretch
     image: debian:stretch-slim
     dockerfile: ../common/Dockerfile.j2
@@ -44,5 +79,5 @@ platforms:
 provisioner:
   name: ansible
   playbooks:
-    converge: ../common/playbooks/source_converge.yml
-    verify: ../common/playbooks/source_verify.yml
+    converge: converge.yml
+    verify: verify.yml

molecule/source_alpine/molecule.yml

@@ -1,34 +0,0 @@
----
-driver:
-  name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint --force-color
-platforms:
-  - name: alpine-3.10
-    image: alpine:3.10
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
-  - name: alpine-3.11
-    image: alpine:3.11
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
-  - name: alpine-3.12
-    image: alpine:3.12
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/sbin/init"
-provisioner:
-  name: ansible
-  playbooks:
-    converge: ../common/playbooks/source_converge.yml
-    verify: ../common/playbooks/source_verify.yml

molecule/source_centos/molecule.yml

@@ -1,27 +0,0 @@
----
-driver:
-  name: docker
-lint: |
-  set -e
-  yamllint .
-  ansible-lint --force-color
-platforms:
-  - name: centos-7
-    image: centos:7
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/usr/sbin/init"
-  - name: centos-8
-    image: centos:8
-    dockerfile: ../common/Dockerfile.j2
-    privileged: true
-    volumes:
-      - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
-    command: "/usr/sbin/init"
-provisioner:
-  name: ansible
-  playbooks:
-    converge: ../common/playbooks/source_converge.yml
-    verify: ../common/playbooks/source_verify.yml