Mercurial > code > home > repos > infra

comparison net.py @ 82:ff60853d7152

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix for bang dhclient'ing its resolv.conf sometimes
author drewp@bigasterisk.com
date Sun, 26 Jun 2022 01:41:42 -0700
parents f0e59adf7b91
children 2fddde57231b
comparison
equal deleted inserted replaced
81:bf1573dd1947 82:ff60853d7152
5 5
6 6
7 def cleanup(): 7 def cleanup():
8 # past attempts 8 # past attempts
9 files.file(path='/etc/netplan/99-pyinfra-written.yaml', present=False) 9 files.file(path='/etc/netplan/99-pyinfra-written.yaml', present=False)
10 files.file(path='/etc/network/interfaces', present=False)
10 11
11 for search_dir in [ 12 for search_dir in [
12 # search path per `man systemd.network`: 13 # search path per `man systemd.network`:
13 # /lib/systemd/network # These OS files are ok. 14 # /lib/systemd/network # These OS files are ok.
14 '/usr/local/lib/systemd/network/', # Probably no such dir. 15 '/usr/local/lib/systemd/network/', # Probably no such dir.
49 files.directory('/etc/systemd/network') 50 files.directory('/etc/systemd/network')
50 51
51 files.template(src="templates/net/bang_10.2.network.j2", dest="/etc/systemd/network/99-10.2.network") 52 files.template(src="templates/net/bang_10.2.network.j2", dest="/etc/systemd/network/99-10.2.network")
52 files.template(src="templates/net/bang_isp.network.j2", dest="/etc/systemd/network/99-isp.network") 53 files.template(src="templates/net/bang_isp.network.j2", dest="/etc/systemd/network/99-isp.network")
53 systemd.service(service='systemd-networkd.service', enabled=True, running=True, restarted=True) 54 systemd.service(service='systemd-networkd.service', enabled=True, running=True, restarted=True)
55 server.sysctl(key='net.ipv4.ip_forward', value=1, persist=True)
56 files.template(src="templates/net/house_net.service.j2", dest="/etc/systemd/system/house_net.service", out_interface='ens4')
57 systemd.service(service='house_net.service', daemon_reload=True, enabled=True, running=True, restarted=True)
54 58
55 elif host.name == 'plus': 59 elif host.name == 'plus':
56 pass 60 pass
57 61
58 elif host.name == 'pipe': 62 elif host.name == 'pipe':
61 files.directory('/etc/systemd/network') 65 files.directory('/etc/systemd/network')
62 66
63 files.template(src="templates/net/pipe_10.2.network.j2", dest="/etc/systemd/network/99-10.2.network") 67 files.template(src="templates/net/pipe_10.2.network.j2", dest="/etc/systemd/network/99-10.2.network")
64 files.template(src="templates/net/pipe_isp.network.j2", dest="/etc/systemd/network/99-isp.network") 68 files.template(src="templates/net/pipe_isp.network.j2", dest="/etc/systemd/network/99-isp.network")
65 systemd.service(service='systemd-networkd.service', enabled=True, running=True, restarted=True) 69 systemd.service(service='systemd-networkd.service', enabled=True, running=True, restarted=True)
66 systemd.service(service='networking.service', enabled=False, running=False)
67 server.sysctl(key='net.ipv4.ip_forward', value=1, persist=True) 70 server.sysctl(key='net.ipv4.ip_forward', value=1, persist=True)
68 files.template(src="templates/net/house_net.service.j2", dest="/etc/systemd/system/house_net.service") 71 files.template(src="templates/net/house_net.service.j2", dest="/etc/systemd/system/house_net.service", out_interface='eth0')
69 systemd.service(service='house_net.service', daemon_reload=True, enabled=True, running=True, restarted=True) 72 systemd.service(service='house_net.service', daemon_reload=True, enabled=True, running=True, restarted=True)
70 73
71 74
72 else: 75 else:
73 cleanup() 76 cleanup()