comparison net.py @ 227:eef9d075b3ca

reformat
author drewp@bigasterisk.com
date Sat, 02 Sep 2023 23:10:53 -0700
parents 6583e3bb3000
children 33d2de3d7e70
comparison
equal deleted inserted replaced
226:117cd86ffb53 227:eef9d075b3ca
1
2 from pyinfra import host 1 from pyinfra import host
3 from pyinfra.operations import apt, files, server, ssh, systemd 2 from pyinfra.operations import apt, files, server, systemd
4 3
5 is_wifi = host.name in ['living', 'plus'] 4 is_wifi = host.name in ['living', 'plus']
6 5
7 6
8 def cleanup(): 7 def cleanup():
12 for search_dir in [ 11 for search_dir in [
13 # search path per `man systemd.network`: 12 # search path per `man systemd.network`:
14 # /lib/systemd/network # These OS files are ok. 13 # /lib/systemd/network # These OS files are ok.
15 '/usr/local/lib/systemd/network/', # Probably no such dir. 14 '/usr/local/lib/systemd/network/', # Probably no such dir.
16 '/run/systemd/network/', # Previous netplan attempts dumped in here. 15 '/run/systemd/network/', # Previous netplan attempts dumped in here.
17 #'/etc/systemd/network/', # I'm going to work in here. 16 # '/etc/systemd/network/', # I'm going to work in here.
18 ]: 17 ]:
19 files.sync( 18 files.sync(
20 src="files/empty_dir/", 19 src="files/empty_dir/",
21 dest=search_dir, 20 dest=search_dir,
22 delete=True, 21 delete=True,
39 'update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy', 38 'update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy',
40 ]) 39 ])
41 # needs reboot if this changed 40 # needs reboot if this changed
42 41
43 if host.name in ['slash', 'dash', 'dot', 'squib']: 42 if host.name in ['slash', 'dash', 'dot', 'squib']:
44 pass # don't break k3s networking! the else-part really breaks it 43 pass # don't break k3s networking! the else-part really breaks it
45 else: 44 else:
46 server.sysctl(key='net.ipv6.conf.all.disable_ipv6', value=1, persist=True) 45 server.sysctl(key='net.ipv6.conf.all.disable_ipv6', value=1, persist=True)
47 46
48 # if is_wifi_pi: 47 # if is_wifi_pi:
49 # files.put(dest="/etc/network/interfaces.d/wlan0", src="files/pi_wlan0_powersave") 48 # files.put(dest="/etc/network/interfaces.d/wlan0", src="files/pi_wlan0_powersave")
63 cleanup() 62 cleanup()
64 63
65 files.template(src="templates/net/bang_10.2.network.j2", dest="/etc/systemd/network/20-10.2.network") 64 files.template(src="templates/net/bang_10.2.network.j2", dest="/etc/systemd/network/20-10.2.network")
66 apt.packages(packages=['network-manager'], present=False) 65 apt.packages(packages=['network-manager'], present=False)
67 66
68
69 elif host.name == 'plus': 67 elif host.name == 'plus':
70 apt.packages(packages=['network-manager'], present=True) 68 apt.packages(packages=['network-manager'], present=True)
71 69
72 elif host.name == 'pipe': 70 elif host.name == 'pipe':
73 cleanup() 71 cleanup()
74 72
75 files.template(src="templates/net/pipe_10.2.network.j2", dest="/etc/systemd/network/99-10.2.network") 73 files.template(src="templates/net/pipe_10.2.network.j2", dest="/etc/systemd/network/99-10.2.network")
76 files.template(src="templates/net/pipe_isp.network.j2", dest="/etc/systemd/network/99-isp.network") 74 files.template(src="templates/net/pipe_isp.network.j2", dest="/etc/systemd/network/99-isp.network")
77 server.sysctl(key='net.ipv4.ip_forward', value=1, persist=True) 75 server.sysctl(key='net.ipv4.ip_forward', value=1, persist=True)
78 files.template(src="templates/net/house_net.service.j2", dest="/etc/systemd/system/house_net.service", out_interface='eth0') 76 files.template(src="templates/net/house_net.service.j2",
77 dest="/etc/systemd/system/house_net.service",
78 out_interface='eth0')
79 systemd.service(service='house_net.service', daemon_reload=True, enabled=True, running=True, restarted=True) 79 systemd.service(service='house_net.service', daemon_reload=True, enabled=True, running=True, restarted=True)
80 80
81 elif host.name == 'ditto': 81 elif host.name == 'ditto':
82 files.template( 82 files.template(
83 src="templates/net/ditto-netplan.yaml.j2", 83 src="templates/net/ditto-netplan.yaml.j2",