Skip to content

Commit

Permalink
Bump Ansible to 6
Browse files Browse the repository at this point in the history
  • Loading branch information
bbaassssiiee committed Nov 17, 2022
1 parent fe4086d commit acfb6a9
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 15 deletions.
1 change: 1 addition & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
skip_list:
- experimental # all rules tagged as experimental
- fqcn-builtins
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

../base:
python3 -m venv ../base
# (source ../base/bin/activate && python3 -m pip install --upgrade pip)
(source ../base/bin/activate && python3 -m pip install --upgrade pip)
(source ../base/bin/activate && pip3 install -r requirements.txt)
(source ../base/bin/activate && mol test)
(source ../base/bin/activate && molecule test)

clean:
rm -rf ../base
2 changes: 1 addition & 1 deletion molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
- openssh-server
- postfix
roles:
- role: base_common
- role: dockpack.base_common
...
1 change: 0 additions & 1 deletion molecule/default/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ lint: |
set -e
yamllint .
ansible-lint
ansible-later
platforms:
- name: base-common-centos7
image: centos:7
Expand Down
2 changes: 1 addition & 1 deletion molecule/default/verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 7 additions & 9 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@
tox
pipx
attrs>=19.2.0
rich>=10.0.0,<11.0.0
sh==1.12.14
ansible==2.9.27
ansible-lint==4.3.7
ansible-later==1.4.0
molecule==3.2.3
molecule-docker
yamllint==1.26.3
ansible-lint==4.3.7
rich==12.5.1
ansible==6.2.
ansible-lint==6.4.0
molecule==4.0.1
molecule-docker==2.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
3 changes: 2 additions & 1 deletion tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
state: started
enabled: true

- block:
- name: RedHat 7 tasks
block:
- name: Check presence of portmapper
stat:
path: /var/run/rpcbind.sock
Expand Down

0 comments on commit acfb6a9

Please sign in to comment.