Skip to content

Commit d7e56e4

Browse files
committed
fixing linting issues.
1 parent 066dc28 commit d7e56e4

File tree

6 files changed

+37
-37
lines changed

6 files changed

+37
-37
lines changed

roles/systemd_networkd/defaults/main.yml

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
systemd_networkd_link: {}
44
systemd_networkd_netdev: {}
55
systemd_networkd_network: {}
6-
76
systemd_networkd_apply_config: false
87
systemd_networkd_enable_resolved: true
98
systemd_networkd_symlink_resolv_conf: true
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
---
22
# handlers for ansible-role-systemd-networkd
33

4-
- name: restart systemd-networkd
4+
- name: Restart systemd-networkd
55
become: true
6-
service:
6+
ansible.builtin.service:
77
name: systemd-networkd
88
state: restarted
99
when: systemd_networkd_apply_config

roles/systemd_networkd/meta/main.yml

+14-14
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
galaxy_info:
33
role_name: systemd_networkd
44
namespace: stackhpc
5-
author: "Anthony Ruhier & StackHPC Ltd"
5+
author: Anthony Ruhier & StackHPC Ltd
66
description: Configures systemd-networkd
77
license: BSD
88
min_ansible_version: "2.5"
99
platforms:
10-
- name: EL
11-
versions:
12-
- all
13-
- name: Fedora
14-
versions:
15-
- all
16-
- name: Ubuntu
17-
versions:
18-
- all
19-
- name: Debian
20-
versions:
21-
- all
10+
- name: EL
11+
versions:
12+
- all
13+
- name: Fedora
14+
versions:
15+
- all
16+
- name: Ubuntu
17+
versions:
18+
- all
19+
- name: Debian
20+
versions:
21+
- all
2222
galaxy_tags:
23-
- networking
23+
- networking
2424
dependencies: []

roles/systemd_networkd/tasks/cleanup.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
- name: Find unexpected systemd-networkd configuration files
66
become: true
7-
find:
8-
paths: "/etc/systemd/network"
7+
ansible.builtin.find:
8+
paths: /etc/systemd/network
99
patterns: "{{ systemd_networkd_cleanup_patterns }}"
1010
use_regex: "{{ systemd_networkd_cleanup_patterns_use_regex | bool }}"
1111
register: networkd_files
@@ -17,8 +17,8 @@
1717
- "{{ systemd_networkd_link.keys() | map('regex_replace', '^(.*)$', '\\1.link') | list }}"
1818
- "{{ systemd_networkd_netdev.keys() | map('regex_replace', '^(.*)$', '\\1.netdev') | list }}"
1919
- "{{ systemd_networkd_network.keys() | map('regex_replace', '^(.*)$', '\\1.network') | list }}"
20-
file:
21-
path: "/etc/systemd/network/{{ item }}"
20+
ansible.builtin.file:
21+
path: /etc/systemd/network/{{ item }}
2222
state: absent
2323
loop: "{{ networkd_files.files | map(attribute='path') | map('basename') | difference(expected_files | flatten) | list }}"
2424
notify:

roles/systemd_networkd/tasks/config.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
32
- name: Ensure systemd-networkd configuration files exist
43
become: true
54
vars:
@@ -12,12 +11,12 @@
1211
files: "{{ systemd_networkd_netdev | dict2items }}"
1312
- type: network
1413
files: "{{ systemd_networkd_network | dict2items }}"
15-
template:
16-
src: "systemd_networkd_config.j2"
17-
dest: "/etc/systemd/network/{{ item.1.key }}.{{ item.0.type }}"
14+
ansible.builtin.template:
15+
src: systemd_networkd_config.j2
16+
dest: /etc/systemd/network/{{ item.1.key }}.{{ item.0.type }}
1817
owner: root
1918
group: systemd-network
20-
mode: 0640
19+
mode: "0640"
2120
loop: "{{ query('subelements', all_files, 'files') }}"
2221
loop_control:
2322
label: "{{ item.0.type }} - {{ item.1.key }}"

roles/systemd_networkd/tasks/main.yml

+13-11
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
---
2-
- import_tasks: cleanup.yml
2+
- name: Import cleanup tasks
3+
ansible.builtin.import_tasks: cleanup.yml
34
when: systemd_networkd_cleanup | bool
45

5-
- import_tasks: config.yml
6+
- name: Import config tasks
7+
ansible.builtin.import_tasks: config.yml
68

79
- name: Make sure systemd-resolved is installed
810
become: true
@@ -13,28 +15,28 @@
1315
- ansible_facts.distribution | lower == 'debian'
1416
- ansible_facts.distribution_major_version >= '12'
1517

16-
- name: enable systemd-networkd
18+
- name: Enable systemd-networkd
1719
become: true
18-
service:
20+
ansible.builtin.service:
1921
name: systemd-networkd
20-
enabled: yes
22+
enabled: true
2123
when: systemd_networkd_network or systemd_networkd_link or systemd_networkd_netdev
2224

23-
- name: start and enable systemd-resolved
25+
- name: Start and enable systemd-resolved
2426
become: true
25-
service:
27+
ansible.builtin.service:
2628
name: systemd-resolved
27-
enabled: yes
29+
enabled: true
2830
state: started
2931
when: systemd_networkd_enable_resolved
3032

31-
- name: replace /etc/resolv.conf with a symlink to the systemd-resolved stub
33+
- name: Replace /etc/resolv.conf with a symlink to the systemd-resolved stub
3234
become: true
33-
file:
35+
ansible.builtin.file:
3436
path: /etc/resolv.conf
3537
src: /run/systemd/resolve/stub-resolv.conf
3638
state: link
37-
force: yes
39+
force: true
3840
when: systemd_networkd_symlink_resolv_conf
3941

4042
# vim: set ts=2 sw=2:

0 commit comments

Comments
 (0)