Update Cookiecutter role template for newer ansible-lint
Change-Id: I818b25ba4112f8dc3ac30e93eac256558b258ab1
diff --git "a/cookiecutters/role/\173\173cookiecutter.role_name\175\175/molecule/default/converge.yml" "b/cookiecutters/role/\173\173cookiecutter.role_name\175\175/molecule/default/converge.yml"
index 00e5fa4..5e3c1b5 100644
--- "a/cookiecutters/role/\173\173cookiecutter.role_name\175\175/molecule/default/converge.yml"
+++ "b/cookiecutters/role/\173\173cookiecutter.role_name\175\175/molecule/default/converge.yml"
@@ -1,7 +1,7 @@
---
# {{ cookiecutter.role_name }} molecule/default/verify.yml
#
-# SPDX-FileCopyrightText: © {{ cookiecutter.year }} {{ cookiecutter.author }} <{{ cookiecutter.email }}>
+# SPDX-FileCopyrightText: {{ cookiecutter.year }} {{ cookiecutter.author }} <{{ cookiecutter.email }}>
# SPDX-License-Identifier: {{ cookiecutter.license }}
- name: Converge
diff --git "a/cookiecutters/role/\173\173cookiecutter.role_name\175\175/molecule/default/molecule.yml" "b/cookiecutters/role/\173\173cookiecutter.role_name\175\175/molecule/default/molecule.yml"
index 4264731..ca1ec97 100644
--- "a/cookiecutters/role/\173\173cookiecutter.role_name\175\175/molecule/default/molecule.yml"
+++ "b/cookiecutters/role/\173\173cookiecutter.role_name\175\175/molecule/default/molecule.yml"
@@ -1,7 +1,7 @@
---
# {{ cookiecutter.role_name }} molecule/default/molecule.yml
#
-# SPDX-FileCopyrightText: © {{ cookiecutter.year }} {{ cookiecutter.author }} <{{ cookiecutter.email }}>
+# SPDX-FileCopyrightText: {{ cookiecutter.year }} {{ cookiecutter.author }} <{{ cookiecutter.email }}>
# SPDX-License-Identifier: {{ cookiecutter.license }}
dependency:
@@ -9,22 +9,23 @@
driver:
name: docker
platforms:
-{%- for platform, versions in cookiecutter.platforms.items() %}
-{%- set platform = platform | lower %}
-{%- for version in versions %}
-{%- if not cookiecutter.molecule_privileged %}
- - name: "{{ platform }}-{{ version }}"
- image: "{{ platform }}:{{ version }}"
-{%- else %}{# privileged, running custom images generated by: https://github.com/paulfantom/dockerfiles #}
- - name: "{{ platform }}-{{ version }}-priv"
- image: "quay.io/paulfantom/molecule-systemd:{{ platform }}-{{ version }}"
+ - name: "ubuntu-18.04-priv"
+ image: "quay.io/paulfantom/molecule-systemd:ubuntu-18.04"
privileged: true
volumes:
- "/sys/fs/cgroup:/sys/fs/cgroup:ro"
-{%- endif %}
-{%- endfor %}
-{%- endfor %}
+ - name: "debian-11-priv"
+ image: "onfinfra/molecule-systemd:debian-11"
+ privileged: true
+ volumes:
+ - "/sys/fs/cgroup:/sys/fs/cgroup:ro"
provisioner:
name: ansible
+ inventory:
+ host_vars:
+ debian-11-priv:
+ ansible_python_interpreter: /usr/bin/python3
+ ubuntu-18.04-priv:
+ ansible_python_interpreter: /usr/bin/python3
verifier:
name: ansible
diff --git "a/cookiecutters/role/\173\173cookiecutter.role_name\175\175/molecule/default/verify.yml" "b/cookiecutters/role/\173\173cookiecutter.role_name\175\175/molecule/default/verify.yml"
index 285b2d7..0abd479 100644
--- "a/cookiecutters/role/\173\173cookiecutter.role_name\175\175/molecule/default/verify.yml"
+++ "b/cookiecutters/role/\173\173cookiecutter.role_name\175\175/molecule/default/verify.yml"
@@ -1,7 +1,7 @@
---
# {{ cookiecutter.role_name }} molecule/default/verify.yml
#
-# SPDX-FileCopyrightText: © {{ cookiecutter.year }} {{ cookiecutter.author }} <{{ cookiecutter.email }}>
+# SPDX-FileCopyrightText: {{ cookiecutter.year }} {{ cookiecutter.author }} <{{ cookiecutter.email }}>
# SPDX-License-Identifier: {{ cookiecutter.license }}
- name: Verify