Skip to content

Commit 5b5917b

Browse files
committed
Fixes for ansible-lint violations
* Update molecule.yml to tolerate larger boot time for Majove image * Address latest ansible-lint complaints * Update dependencies (some to address known vulnerabilities)
1 parent f17776a commit 5b5917b

File tree

3 files changed

+27
-21
lines changed

3 files changed

+27
-21
lines changed

molecule/default/molecule.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ platforms:
1313
box_version: "${MOLECULE_BOX_VERSION}"
1414
memory: 2048
1515
cpus: 4
16+
instance_raw_config_args:
17+
- "vm.boot_timeout = 600"
1618
config_options:
1719
synced_folder: false
18-
boot_timeout: 300
1920
provisioner:
2021
name: ansible
2122
playbooks:

tasks/main.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,16 @@
4040

4141
- name: Check for Command Line Tools in Software Update list
4242
shell: >
43+
set -o pipefail;
4344
softwareupdate -l |
4445
grep -B 1 -E 'Command Line Tools' |
4546
awk -F'*' '/^ +\*/ {print $2}' |
4647
sed 's/^ *//' |
4748
grep -iE '[0-9|.]' |
4849
sort |
4950
tail -n1
51+
args:
52+
executable: /bin/bash
5053
register: su_list
5154
when: pkg_info.rc != 0 or compiler.rc != 0 or not clt.stat.exists
5255
changed_when: false

tests/test-requirements.txt

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,61 @@
1-
ansible==2.7.2
2-
ansible-lint==3.4.23
1+
ansible==2.7.7
2+
ansible-lint==4.1.0
33
anyconfig==0.9.7
4-
arrow==0.12.1
4+
arrow==0.13.1
55
asn1crypto==0.24.0
6-
atomicwrites==1.2.1
6+
atomicwrites==1.3.0
77
attrs==18.2.0
88
backports.functools-lru-cache==1.5
9-
bcrypt==3.1.4
9+
bcrypt==3.1.6
1010
binaryornot==0.4.4
1111
Cerberus==1.2
12-
certifi==2018.10.15
13-
cffi==1.11.5
12+
certifi==2018.11.29
13+
cffi==1.12.1
1414
chardet==3.0.4
1515
click==6.7
1616
click-completion==0.3.1
1717
colorama==0.3.9
18-
configparser==3.5.0
18+
configparser==3.7.1
1919
cookiecutter==1.6.0
20-
cryptography==2.4.2
20+
cryptography==2.5
2121
enum34==1.1.6
2222
fasteners==0.14.1
2323
flake8==3.5.0
2424
funcsigs==1.0.2
2525
future==0.17.1
26-
git-url-parse==1.1.0
27-
idna==2.7
26+
git-url-parse==1.2.0
27+
idna==2.8
2828
ipaddress==1.0.22
2929
Jinja2==2.10
3030
jinja2-time==0.2.0
3131
MarkupSafe==1.1.0
3232
mccabe==0.6.1
3333
molecule==2.19.0
3434
monotonic==1.5
35-
more-itertools==4.3.0
35+
more-itertools==5.0.0
3636
paramiko==2.4.2
37-
pathlib2==2.3.2
37+
pathlib2==2.3.3
3838
pathspec==0.5.9
3939
pbr==4.1.0
4040
pexpect==4.6.0
41-
pluggy==0.8.0
41+
pluggy==0.8.1
4242
poyo==0.4.2
4343
psutil==5.4.6
4444
ptyprocess==0.6.0
4545
py==1.7.0
46-
pyasn1==0.4.4
46+
pyasn1==0.4.5
4747
pycodestyle==2.3.1
4848
pycparser==2.19
4949
pyflakes==1.6.0
5050
PyNaCl==1.3.0
51-
pytest==4.0.1
52-
python-dateutil==2.7.5
51+
pytest==4.2.1
52+
python-dateutil==2.8.0
5353
python-gilt==1.2.1
5454
python-vagrant==0.5.15
55-
PyYAML==3.13
56-
requests==2.20.1
55+
PyYAML==4.2b4
56+
requests==2.21.0
57+
ruamel.ordereddict==0.4.13
58+
ruamel.yaml==0.15.88
5759
scandir==1.9.0
5860
sh==1.12.14
5961
six==1.11.0
@@ -62,4 +64,4 @@ testinfra==1.16.0
6264
tree-format==0.1.2
6365
urllib3==1.24.1
6466
whichcraft==0.5.2
65-
yamllint==1.11.1
67+
yamllint==1.15.0

0 commit comments

Comments
 (0)