From 69de5f5fc550035b38a7f3968648a122fd0b2677 Mon Sep 17 00:00:00 2001
From: Lars Beckers <lars.beckers@rwth-aachen.de>
Date: Thu, 8 Aug 2019 00:34:29 +0200
Subject: [PATCH] fix linter errors
---
mrtg/handlers/main.yml | 3 +--
mrtg/tasks/main.yml | 6 +++---
networkd/tasks/bond.yml | 4 ++--
networkd/tasks/main.yml | 4 ++--
networkd/tasks/vlan.yml | 4 ++--
radius-client/handlers/main.yml | 3 ++-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/mrtg/handlers/main.yml b/mrtg/handlers/main.yml
index 9527d2d..c52a852 100644
--- a/mrtg/handlers/main.yml
+++ b/mrtg/handlers/main.yml
@@ -1,5 +1,4 @@
---
-# file: shared-roles/network/mrtg/handlers/main.yml
- name: create tmpfiles
- shell: systemd-tmpfiles --create
+ command: systemd-tmpfiles --create
diff --git a/mrtg/tasks/main.yml b/mrtg/tasks/main.yml
index 64cffdc..8a0ee13 100644
--- a/mrtg/tasks/main.yml
+++ b/mrtg/tasks/main.yml
@@ -34,7 +34,7 @@
mode: "u+rwx,g+rxs"
tags: mrtg
-- name: create the config
+- name: create the config # noqa 301
# yamllint disable-line rule:line-length
command: "cfgmaker --output /etc/mrtg.cfg {% for switch in mrtg_switches %} --ifdesc=alias {{switch['community']}}@{{switch['router']}}:::::2 {% endfor %}"
tags: mrtg
@@ -68,14 +68,14 @@
- create tmpfiles
tags: mrtg
-- name: create an index HTML page
+- name: create an index HTML page # noqa 301
# yamllint disable-line rule:line-length
command: "indexmaker --output /var/www/mrtg/index.html --title='Traffic of {{domain}}' --columns=3 --pagetop='{% for switch in mrtg_switches %}<a href=\"index-{{switch['router']}}.html\"><b>{{switch['router']}}</b>.{{domain}}</a> {% endfor %} {% if use_weathermap %}<a href=\"weathermap.html\">Weathermap</a>{%endif %}' /etc/mrtg.cfg"
become: true
become_user: mrtg
tags: mrtg
-- name: create separate index HTML pages
+- name: create separate index HTML pages # noqa 301
# yamllint disable-line rule:line-length
command: "indexmaker --output /var/www/mrtg/index-{{item['router']}}.html --title {{item['router']}}.{{domain}} --filter name=~{{item['router']}}_[0-9]+ --columns=3 --pagetop='<a href=\"index.html\">back</a>' /etc/mrtg.cfg"
with_items: "{{mrtg_switches}}"
diff --git a/networkd/tasks/bond.yml b/networkd/tasks/bond.yml
index ed7904e..b929e13 100644
--- a/networkd/tasks/bond.yml
+++ b/networkd/tasks/bond.yml
@@ -60,7 +60,7 @@
group: root
mode: '0644'
with_items: "{{ bond.vlans|default(networkd_bond_vlans) }}"
- when: item.bridge == True
+ when: item.bridge
notify:
- restart networkd
- name: ensure bridge networks are configured
@@ -71,6 +71,6 @@
group: root
mode: '0644'
with_items: "{{ bond.vlans|default(networkd_bond_vlans) }}"
- when: item.bridge == True
+ when: item.bridge
notify:
- restart networkd
diff --git a/networkd/tasks/main.yml b/networkd/tasks/main.yml
index afaab46..dca3fe4 100644
--- a/networkd/tasks/main.yml
+++ b/networkd/tasks/main.yml
@@ -29,9 +29,9 @@
- name: delete network config files generated by the bootstrap process
file:
- path: "{{item.path}}"
+ path: "{{ item.path }}"
state: absent
- loop: "{{bootstrap_network_files.files}}"
+ loop: "{{ bootstrap_network_files.files }}"
notify:
- restart networkd
diff --git a/networkd/tasks/vlan.yml b/networkd/tasks/vlan.yml
index 9205ba4..b8f6d15 100644
--- a/networkd/tasks/vlan.yml
+++ b/networkd/tasks/vlan.yml
@@ -34,7 +34,7 @@
group: root
mode: '0644'
with_items: "{{ vlan.vlans }}"
- when: item.bridge == True
+ when: item.bridge
notify:
- restart networkd
- name: ensure bridge networks are configured
@@ -45,6 +45,6 @@
group: root
mode: '0644'
with_items: "{{ vlan.vlans }}"
- when: item.bridge == True
+ when: item.bridge
notify:
- restart networkd
diff --git a/radius-client/handlers/main.yml b/radius-client/handlers/main.yml
index e5bc998..324e296 100644
--- a/radius-client/handlers/main.yml
+++ b/radius-client/handlers/main.yml
@@ -1,7 +1,8 @@
---
- name: reload systemd service files
- command: systemctl daemon-reload
+ systemd:
+ daemon_reload: true
- name: restart wpasupplicant@eth0
service: name=wpa_supplicant-wired@eth0 state=restarted
--
GitLab