From 2d9d66c16db51a85f5e686b184a4a5496f40eedd Mon Sep 17 00:00:00 2001 From: Otthorn Date: Mon, 12 Apr 2021 22:30:52 +0200 Subject: [PATCH 1/4] :arrow_up: Update CI: ansible-lint version --- docker-ansible-lint/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-ansible-lint/Dockerfile b/docker-ansible-lint/Dockerfile index 1db9744..7acf954 100644 --- a/docker-ansible-lint/Dockerfile +++ b/docker-ansible-lint/Dockerfile @@ -3,5 +3,5 @@ LABEL description="Aurore's docker image for ansible-lint" RUN apk add --no-cache gcc musl-dev python3-dev libffi-dev openssl-dev cargo RUN pip install --no-cache-dir "yamllint>=1.26.0,<2.0" -RUN pip install --no-cache-dir "ansible-lint==5.0.0" +RUN pip install --no-cache-dir "ansible-lint>=5.0.0" RUN pip install --no-cache-dir "ansible>=2.10,<2.11" From 5c08fed9dec687bca4e947167996dba3169b9433 Mon Sep 17 00:00:00 2001 From: Otthorn Date: Mon, 12 Apr 2021 22:32:03 +0200 Subject: [PATCH 2/4] :construction_worker: Only warn for unnamed tasks (used in include_role) --- .ansible-lint | 1 + 1 file changed, 1 insertion(+) diff --git a/.ansible-lint b/.ansible-lint index de44c0b..dbd729e 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -6,6 +6,7 @@ skip_list: warn_list: - experimental # all rules tagged as experimental + - unnamed-task # only warn for unnamed tag (used in include_role) exclude_paths: - group_vars/all/vault.yml From 3a600d9061ca6fe3046059308ef6cf2d5d33a18f Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sat, 17 Apr 2021 17:37:45 +0200 Subject: [PATCH 3/4] Give a name to unnamed tasks --- roles/baseconfig/tasks/main.yml | 3 ++- roles/borgbackup_client/tasks/main.yml | 3 ++- roles/borgbackup_server/tasks/main.yml | 3 ++- roles/docker/tasks/main.yml | 3 ++- roles/nginx/tasks/main.yml | 3 ++- roles/prometheus/tasks/main.yml | 3 ++- roles/prometheus_federate/tasks/main.yml | 3 ++- roles/re2o_service/tasks/main.yml | 3 ++- roles/unifi_controller/tasks/main.yml | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/roles/baseconfig/tasks/main.yml b/roles/baseconfig/tasks/main.yml index 77cb834..0af0b40 100644 --- a/roles/baseconfig/tasks/main.yml +++ b/roles/baseconfig/tasks/main.yml @@ -29,7 +29,8 @@ retries: 3 until: apt_result is succeeded -- include_role: +- name: Configure MOTD + include_role: name: update_motd # Configure APT mirrors on Debian Stretch diff --git a/roles/borgbackup_client/tasks/main.yml b/roles/borgbackup_client/tasks/main.yml index 728d253..fcf1226 100644 --- a/roles/borgbackup_client/tasks/main.yml +++ b/roles/borgbackup_client/tasks/main.yml @@ -108,7 +108,8 @@ state: started enabled: true -- include_role: +- name: Configure MOTD + include_role: name: update_motd vars: key: 10-borgmatic diff --git a/roles/borgbackup_server/tasks/main.yml b/roles/borgbackup_server/tasks/main.yml index 9c77196..ff31c07 100644 --- a/roles/borgbackup_server/tasks/main.yml +++ b/roles/borgbackup_server/tasks/main.yml @@ -36,7 +36,8 @@ group: "{{ borg_server_group }}" mode: u=rwx,g=,o= -- include_role: +- name: Configure MOTD + include_role: name: update_motd vars: motd_messages: diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 5484f88..38d3a55 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -51,7 +51,8 @@ dest: /usr/local/bin/docker-compose mode: "0755" -- include_role: +- name: Configure MOTD + include_role: name: update_motd vars: motd_messages: diff --git a/roles/nginx/tasks/main.yml b/roles/nginx/tasks/main.yml index 146b93c..7a3af07 100644 --- a/roles/nginx/tasks/main.yml +++ b/roles/nginx/tasks/main.yml @@ -148,7 +148,8 @@ group: www-data mode: 0644 -- include_role: +- name: Configure MOTD + include_role: name: update_motd vars: motd_messages: diff --git a/roles/prometheus/tasks/main.yml b/roles/prometheus/tasks/main.yml index d141ecc..f4a5b04 100644 --- a/roles/prometheus/tasks/main.yml +++ b/roles/prometheus/tasks/main.yml @@ -109,7 +109,8 @@ enabled: true state: started -- include_role: +- name: Configure MOTD + include_role: name: update_motd vars: motd_messages: diff --git a/roles/prometheus_federate/tasks/main.yml b/roles/prometheus_federate/tasks/main.yml index 02ae85e..cc96e65 100644 --- a/roles/prometheus_federate/tasks/main.yml +++ b/roles/prometheus_federate/tasks/main.yml @@ -34,7 +34,8 @@ enabled: true state: started -- include_role: +- name: Configure MOTD + include_role: name: update_motd vars: motd_messages: diff --git a/roles/re2o_service/tasks/main.yml b/roles/re2o_service/tasks/main.yml index 882fdf9..2bed1a3 100644 --- a/roles/re2o_service/tasks/main.yml +++ b/roles/re2o_service/tasks/main.yml @@ -40,7 +40,8 @@ group: nogroup state: link -- include_role: +- name: Configure MOTD + include_role: name: update_motd vars: motd_messages: diff --git a/roles/unifi_controller/tasks/main.yml b/roles/unifi_controller/tasks/main.yml index b43c74b..811b5e1 100644 --- a/roles/unifi_controller/tasks/main.yml +++ b/roles/unifi_controller/tasks/main.yml @@ -40,7 +40,8 @@ retries: 3 until: apt_result is succeeded -- include_role: +- name: Configure MOTD + include_role: name: update_motd vars: motd_messages: From 9c47067f939723c6a859061923caefc78c65b26f Mon Sep 17 00:00:00 2001 From: Otthorn Date: Sat, 17 Apr 2021 17:38:41 +0200 Subject: [PATCH 4/4] No need to only warm for unnamed task anymore --- .ansible-lint | 1 - 1 file changed, 1 deletion(-) diff --git a/.ansible-lint b/.ansible-lint index dbd729e..de44c0b 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -6,7 +6,6 @@ skip_list: warn_list: - experimental # all rules tagged as experimental - - unnamed-task # only warn for unnamed tag (used in include_role) exclude_paths: - group_vars/all/vault.yml