File tree 6 files changed +37
-37
lines changed
6 files changed +37
-37
lines changed Original file line number Diff line number Diff line change 3
3
systemd_networkd_link : {}
4
4
systemd_networkd_netdev : {}
5
5
systemd_networkd_network : {}
6
-
7
6
systemd_networkd_apply_config : false
8
7
systemd_networkd_enable_resolved : true
9
8
systemd_networkd_symlink_resolv_conf : true
Original file line number Diff line number Diff line change 1
1
---
2
2
# handlers for ansible-role-systemd-networkd
3
3
4
- - name : restart systemd-networkd
4
+ - name : Restart systemd-networkd
5
5
become : true
6
- service :
6
+ ansible.builtin. service :
7
7
name : systemd-networkd
8
8
state : restarted
9
9
when : systemd_networkd_apply_config
Original file line number Diff line number Diff line change 2
2
galaxy_info :
3
3
role_name : systemd_networkd
4
4
namespace : stackhpc
5
- author : " Anthony Ruhier & StackHPC Ltd"
5
+ author : Anthony Ruhier & StackHPC Ltd
6
6
description : Configures systemd-networkd
7
7
license : BSD
8
8
min_ansible_version : " 2.5"
9
9
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
22
22
galaxy_tags :
23
- - networking
23
+ - networking
24
24
dependencies : []
Original file line number Diff line number Diff line change 4
4
5
5
- name : Find unexpected systemd-networkd configuration files
6
6
become : true
7
- find :
8
- paths : " /etc/systemd/network"
7
+ ansible.builtin. find :
8
+ paths : /etc/systemd/network
9
9
patterns : " {{ systemd_networkd_cleanup_patterns }}"
10
10
use_regex : " {{ systemd_networkd_cleanup_patterns_use_regex | bool }}"
11
11
register : networkd_files
17
17
- " {{ systemd_networkd_link.keys() | map('regex_replace', '^(.*)$', '\\ 1.link') | list }}"
18
18
- " {{ systemd_networkd_netdev.keys() | map('regex_replace', '^(.*)$', '\\ 1.netdev') | list }}"
19
19
- " {{ 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 }}
22
22
state : absent
23
23
loop : " {{ networkd_files.files | map(attribute='path') | map('basename') | difference(expected_files | flatten) | list }}"
24
24
notify :
Original file line number Diff line number Diff line change 1
1
---
2
-
3
2
- name : Ensure systemd-networkd configuration files exist
4
3
become : true
5
4
vars :
12
11
files : " {{ systemd_networkd_netdev | dict2items }}"
13
12
- type : network
14
13
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 }}
18
17
owner : root
19
18
group : systemd-network
20
- mode : 0640
19
+ mode : " 0640"
21
20
loop : " {{ query('subelements', all_files, 'files') }}"
22
21
loop_control :
23
22
label : " {{ item.0.type }} - {{ item.1.key }}"
Original file line number Diff line number Diff line change 1
1
---
2
- - import_tasks : cleanup.yml
2
+ - name : Import cleanup tasks
3
+ ansible.builtin.import_tasks : cleanup.yml
3
4
when : systemd_networkd_cleanup | bool
4
5
5
- - import_tasks : config.yml
6
+ - name : Import config tasks
7
+ ansible.builtin.import_tasks : config.yml
6
8
7
9
- name : Make sure systemd-resolved is installed
8
10
become : true
13
15
- ansible_facts.distribution | lower == 'debian'
14
16
- ansible_facts.distribution_major_version >= '12'
15
17
16
- - name : enable systemd-networkd
18
+ - name : Enable systemd-networkd
17
19
become : true
18
- service :
20
+ ansible.builtin. service :
19
21
name : systemd-networkd
20
- enabled : yes
22
+ enabled : true
21
23
when : systemd_networkd_network or systemd_networkd_link or systemd_networkd_netdev
22
24
23
- - name : start and enable systemd-resolved
25
+ - name : Start and enable systemd-resolved
24
26
become : true
25
- service :
27
+ ansible.builtin. service :
26
28
name : systemd-resolved
27
- enabled : yes
29
+ enabled : true
28
30
state : started
29
31
when : systemd_networkd_enable_resolved
30
32
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
32
34
become : true
33
- file :
35
+ ansible.builtin. file :
34
36
path : /etc/resolv.conf
35
37
src : /run/systemd/resolve/stub-resolv.conf
36
38
state : link
37
- force : yes
39
+ force : true
38
40
when : systemd_networkd_symlink_resolv_conf
39
41
40
42
# vim: set ts=2 sw=2:
You can’t perform that action at this time.
0 commit comments