Skip to content

Commit e7b69ca

Browse files
committed
Add linters and rules. Fix linter warnings
1 parent 152a65d commit e7b69ca

File tree

8 files changed

+17
-6
lines changed

8 files changed

+17
-6
lines changed

.ansible-lint

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
exclude_paths:
3+
- ./.imported_roles/

.flake8

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[flake8]
2+
max-line-length = 80
3+
exclude = .imported_roles

molecule/resources/yamllint.conf .yamllint

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
extends: default
23

34
ignore: |
@@ -12,4 +13,4 @@ rules:
1213
indent-sequences: true
1314
level: warning
1415
braces:
15-
max-spaces-inside: 1
16+
max-spaces-inside: 1

environments/example/inventory.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
all:
23
hosts:
34
linux_01:

molecule/default/molecule.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ driver:
99
name: docker
1010

1111
lint: |
12-
yamllint -c molecule/resources/yamllint.conf .
12+
set -e
13+
yamllint .
14+
flake8
15+
ansible-lint
1316
1417
platforms:
1518
- name: common

molecule/default/playbook.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
22
- import_playbook: ../../site.yml
33
vars:
4-
inventory_dir: "{{playbook_dir}}/../molecule/resources/"
4+
inventory_dir: "{{ playbook_dir }}/../molecule/resources/"
55
zabbix_url: "http://localhost:8080/zabbix/"

molecule/parallels/playbook.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
---
22
- import_playbook: ../../site.yml
33
vars:
4-
inventory_dir: "{{playbook_dir}}/../molecule/resources/"
4+
inventory_dir: "{{ playbook_dir }}/../molecule/resources/"

playbooks/zabbix.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
- { role: dj-wasabi.zabbix-server }
88
- { role: dj-wasabi.zabbix-web }
99
vars_files:
10-
- "{{inventory_dir}}/play_vars/zabbix-server.yml"
10+
- "{{ inventory_dir }}/play_vars/zabbix-server.yml"
1111

1212
- name: Configure zabbix agent
1313
hosts: all
@@ -22,4 +22,4 @@
2222
- { role: dj-wasabi.zabbix-agent, become: false, tags: ['api'] }
2323
serial: 1
2424
vars_files:
25-
- "{{inventory_dir}}/play_vars/zabbix-api.yml"
25+
- "{{ inventory_dir }}/play_vars/zabbix-api.yml"

0 commit comments

Comments
 (0)