From 99cb571708f832bff8f4b7af8bcb0b8870d8306f Mon Sep 17 00:00:00 2001
From: Mischa ter Smitten <mischa@tersmitten.nl>
Date: Tue, 28 Mar 2023 13:35:21 +0200
Subject: [PATCH] Consistency changes

---
 .ansible-lint                 | 2 +-
 handlers/main.yml             | 2 +-
 molecule/default/converge.yml | 4 ++--
 molecule/default/molecule.yml | 4 +++-
 molecule/default/prepare.yml  | 8 ++++----
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.ansible-lint b/.ansible-lint
index 50dcf7a..b04781e 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -1,5 +1,5 @@
 ---
 warn_list:
   - role-name
+  - name[play]
   - name[casing]
-  - yaml[comments-indentation]
diff --git a/handlers/main.yml b/handlers/main.yml
index 06c1a9d..b5974b3 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,5 +1,5 @@
 # handlers file
 ---
-- name: update font cache
+- name: update font cache  # noqa no-changed-when
   ansible.builtin.command: >
     fc-cache -f -v
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index 5177d40..2fbb6ae 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -5,7 +5,7 @@
   pre_tasks:
     - name: include vars
       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 vars
+      #   ansible.builtin.include_vars: "{{ playbook_dir }}/../../tests/vars/main.yml"
   roles:
     - ../../../
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index fbb7120..8841165 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -8,7 +8,9 @@ platforms:
     image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu1604}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+      - /var/lib/containerd
+    cgroupns_mode: host
     privileged: true
     pre_build_image: true
 provisioner:
diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
index 26f2377..4ce344c 100644
--- a/molecule/default/prepare.yml
+++ b/molecule/default/prepare.yml
@@ -5,7 +5,7 @@
   pre_tasks:
     - name: include vars
       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"
+      # - 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"