From 6402364debcfd0ce61771b14383d9d2bf7b9cdaf Mon Sep 17 00:00:00 2001
From: Baptiste DE RENZO <baptiste.derenzo@ubicast.eu>
Date: Tue, 11 Jan 2022 15:30:03 +0000
Subject: [PATCH] Fix linting, Refs #35415
---
playbooks/bench.yml | 8 ++++++--
requirements.dev.txt | 4 ++--
roles/mediaimport/tasks/main.yml | 6 +++---
roles/mediaserver/tasks/main.yml | 4 ++--
4 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/playbooks/bench.yml b/playbooks/bench.yml
index 301f29b4..d653897e 100755
--- a/playbooks/bench.yml
+++ b/playbooks/bench.yml
@@ -13,10 +13,12 @@
- bench-server
tasks:
- name: restart bench-server
+ tags:
+ - never
+ - prepare-bench
service:
name: bench-server
state: restarted
- tags: [ 'never', 'prepare-bench' ]
- name: DEPLOY BENCHMARK WORKERS
hosts: bench_worker
@@ -25,9 +27,11 @@
- bench-worker
tasks:
- name: restart bench-worker
+ tags:
+ - never
+ - prepare-bench
service:
name: bench-worker
state: restarted
- tags: [ 'never', 'prepare-bench' ]
...
diff --git a/requirements.dev.txt b/requirements.dev.txt
index 11c8fe21..759503fa 100644
--- a/requirements.dev.txt
+++ b/requirements.dev.txt
@@ -1,6 +1,6 @@
ansible-lint
flake8
-git+git://github.com/atmaniak/molecule@e03437923b302fca1bd7b4f6030c6956ad00367a#egg=molecule[docker]
-#molecule[docker]
+#git+git://github.com/atmaniak/molecule@e03437923b302fca1bd7b4f6030c6956ad00367a#egg=molecule[docker]
+molecule[docker]
pytest-testinfra
yamllint
diff --git a/roles/mediaimport/tasks/main.yml b/roles/mediaimport/tasks/main.yml
index e3c979b7..bf56d605 100644
--- a/roles/mediaimport/tasks/main.yml
+++ b/roles/mediaimport/tasks/main.yml
@@ -86,7 +86,7 @@
path: /etc/ssl/{{ ansible_fqdn }}/key.pem
- name: generate an csr
- when: mediaimport_privkey is changed
+ when: mediaimport_privkey is changed # noqa no-handler
register: mediaimport_csr
openssl_csr:
path: /etc/ssl/{{ ansible_fqdn }}/csr.pem
@@ -94,7 +94,7 @@
common_name: "{{ ansible_fqdn }}"
- name: generate a self-signed certificate
- when: mediaimport_csr is changed
+ when: mediaimport_csr is changed # noqa no-handler
register: mediaimport_cert
openssl_certificate:
path: /etc/ssl/{{ ansible_fqdn }}/cert.pem
@@ -103,7 +103,7 @@
provider: selfsigned
- name: concatenate key and certificate
- when: mediaimport_cert is changed
+ when: mediaimport_cert is changed # noqa no-handler
notify: restart pure-ftpd
shell: >
cat /etc/ssl/{{ ansible_fqdn }}/key.pem /etc/ssl/{{ ansible_fqdn }}/cert.pem > /etc/ssl/private/pure-ftpd.pem;
diff --git a/roles/mediaserver/tasks/main.yml b/roles/mediaserver/tasks/main.yml
index 45f2ecf9..bdbfcb66 100644
--- a/roles/mediaserver/tasks/main.yml
+++ b/roles/mediaserver/tasks/main.yml
@@ -92,7 +92,7 @@
throttle: 1
- name: synchronize configuration between servers
- ignore_errors: true
+ ignore_errors: true # noqa ignore-errors
when:
- groups['mediaserver'] | length > 1
- inventory_hostname != groups['mediaserver'][0]
@@ -119,7 +119,7 @@
tags: mediaserver-synchronize
- name: synchronize letsencrypt configuration between servers
- ignore_errors: true
+ ignore_errors: true # noqa ignore-errors
when:
- groups['mediaserver'] | length > 1
- inventory_hostname != groups['mediaserver'][0]
--
GitLab