Skip to content

Commit

Permalink
Update ansible-list
Browse files Browse the repository at this point in the history
Tackle (don't skip) the warnings.
  • Loading branch information
jpopelka committed Jul 2, 2023
1 parent 386ef8a commit f8e83c3
Show file tree
Hide file tree
Showing 14 changed files with 18 additions and 17 deletions.
7 changes: 2 additions & 5 deletions .ansible-lint
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@

exclude_paths:
- zuul.d/secret-sflogs.yaml

skip_list:
- missing-import # in playbooks/base/ we import roles not from this repo
- role-name # we're not going to publish the roles
- unnamed-task # pretty strict
# {pre|post}.yaml import roles not from this repo
- playbooks/base/

mock_modules:
# Silence for F35, move to ansible.posix.selinux since F36
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ repos:
hooks:
- id: prettier
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v4.4.0
hooks:
- id: check-added-large-files
- id: check-merge-conflict
# - id: check-yaml
- id: detect-private-key
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/willthames/ansible-lint.git
rev: v6.3.0
- repo: https://github.com/ansible/ansible-lint.git
rev: v6.17.2
hooks:
- id: ansible-lint
files: \.(yaml|yml)$
Expand Down
2 changes: 1 addition & 1 deletion playbooks/base/pre.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
when: "ansible_connection != 'kubectl'"
- block:
- include_role: name=prepare-workspace-openshift
- include_role: name=remove-zuul-sshkey
- include_role: name=remove_zuul_sshkey
run_once: true
when: "ansible_connection == 'kubectl'"
- import_role: name=ensure-output-dirs
Expand Down
3 changes: 2 additions & 1 deletion playbooks/linters/run.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
- hosts: all
- name: Run linters
hosts: all
roles:
- linters
5 changes: 3 additions & 2 deletions playbooks/oc-cluster-up.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
- hosts: all
- name: Run oc_cluster_up
hosts: all
roles:
- oc-cluster-up
- oc_cluster_up
5 changes: 3 additions & 2 deletions playbooks/pre-commit.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
---
- hosts: all
- name: Run pre_commit
hosts: all
roles:
- pre-commit
- pre_commit
3 changes: 2 additions & 1 deletion roles/linters/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
ansible.builtin.set_fact:
linter_failure: false

- include: "lint_{{ item }}.yaml"
- name: Include linter tasks
ansible.builtin.include_tasks: "lint_{{ item }}.yaml"
loop: "{{ linters }}"

- name: Fail if one linter failed
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
ansible.builtin.get_url:
url: https://download.docker.com/linux/centos/docker-ce.repo
dest: /etc/yum.repos.d/docker-ce.repo
mode: 0644
mode: "0644"
become: true

- name: Install Docker CE
Expand Down Expand Up @@ -42,7 +42,7 @@
line: |
{"insecure-registries" : [ "172.30.0.0/16" ]}
create: true
mode: 0644
mode: "0644"
become: true

- name: Make sure docker is running
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit f8e83c3

Please sign in to comment.