diff --git a/.ansible-lint b/.ansible-lint new file mode 100644 index 0000000..51b9e95 --- /dev/null +++ b/.ansible-lint @@ -0,0 +1,4 @@ +--- +skip_list: + - experimental # all rules tagged as experimental + - fqcn-builtins diff --git a/.yamllint b/.yamllint index 2f6370c..3602852 100644 --- a/.yamllint +++ b/.yamllint @@ -3,8 +3,5 @@ extends: default rules: truthy: - allowed-values: ['true', 'false', 'on'] - check-keys: true - -ignore: | - .tox/ + allowed-values: ['true', 'false'] + check-keys: false diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index 5d7aafa..174f5e9 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -1,9 +1,10 @@ --- - hosts: all - roles: - - role: base_git - vars: - collections_enabled: true - - role: base_git - vars: - collections_enabled: true + vars: + role_name: "{{ lookup('env', 'MOLECULE_PROJECT_DIRECTORY') | basename }}" + collections_enabled: true + + tasks: + - name: "Include {{ role_name }}" + ansible.builtin.include_role: + name: "{{ role_name }}" diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml index 73ca547..925d473 100644 --- a/molecule/default/verify.yml +++ b/molecule/default/verify.yml @@ -21,7 +21,7 @@ get_url: url: "{{ goss_url }}" dest: "{{ goss_dst }}" - sha256sum: "{{ goss_sha256sum }}" + checksum: "sha256:{{ goss_sha256sum }}" mode: 0755 register: download_goss until: download_goss is succeeded diff --git a/requirements.txt b/requirements.txt index 2cee561..e029626 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,14 +2,14 @@ tox pipx attrs>=19.2.0 -rich>=10.0.0,<11.0.0 -sh==1.12.14 -ansible==4.2.0 -ansible-later==1.4.1 -molecule==3.2.3 -molecule-docker -yamllint==1.26.3 -ansible-lint==4.3.7 +rich==12.5.1 +ansible==6.2.0 +ansible-lint==6.4.0 +molecule==4.0.1 +molecule-docker==2.0.0 +molecule-vagrant-1.0.0 +yamllint==1.28.0 docker>=4.3.1 ssh-audit anyconfig>=0.10.0 # not directly required, pinned by Snyk to avoid a vulnerability +setuptools>=65.5.1 # not directly required, pinned by Snyk to avoid a vulnerability