Mercurial > code > home > repos > infra

changeset 100:5a1f6b4d1d4a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
net.py simplification now that even bang is a normal node
author drewp@bigasterisk.com
date Fri, 15 Jul 2022 14:39:24 -0700
parents 6e159d3bdd40
children 0322d21c5d4a
files net.py
diffstat 1 files changed, 6 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/net.py	Fri Jul 15 14:37:12 2022 -0700
+++ b/net.py	Fri Jul 15 14:39:24 2022 -0700
@@ -35,10 +35,10 @@
 
 server.sysctl(key='net.ipv6.conf.all.disable_ipv6', value=1, persist=True)
 
+files.directory('/etc/systemd/network')
 if host.name == 'prime':
     cleanup()
 
-    files.directory('/etc/systemd/network')
     files.template(
         src="templates/net/prime.network.j2",
         dest="/etc/systemd/network/99-prime.network",
@@ -48,14 +48,10 @@
 elif host.name == 'bang':
     cleanup()
 
-    files.directory('/etc/systemd/network')
-
     files.template(src="templates/net/bang_10.2.network.j2", dest="/etc/systemd/network/99-10.2.network")
-    files.template(src="templates/net/bang_isp.network.j2", dest="/etc/systemd/network/99-isp.network")
-    systemd.service(service='systemd-networkd.service', enabled=True, running=True, restarted=True)
-    server.sysctl(key='net.ipv4.ip_forward', value=1, persist=True)
-    files.template(src="templates/net/house_net.service.j2", dest="/etc/systemd/system/house_net.service", out_interface='ens4')
-    systemd.service(service='house_net.service', daemon_reload=True, enabled=True, running=True, restarted=True)
+    files.file(path="/etc/systemd/network/99-isp.network", present=False)
+    files.file(path="/etc/systemd/system/house_net.service", present=False)
+    systemd.service(service='house_net.service', enabled=False, running=False)
 
 elif host.name == 'plus':
     pass
@@ -63,11 +59,8 @@
 elif host.name == 'pipe':   
     cleanup()
 
-    files.directory('/etc/systemd/network')
-
     files.template(src="templates/net/pipe_10.2.network.j2", dest="/etc/systemd/network/99-10.2.network")
     files.template(src="templates/net/pipe_isp.network.j2", dest="/etc/systemd/network/99-isp.network")
-    systemd.service(service='systemd-networkd.service', enabled=True, running=True, restarted=True)
     server.sysctl(key='net.ipv4.ip_forward', value=1, persist=True)
     files.template(src="templates/net/house_net.service.j2", dest="/etc/systemd/system/house_net.service", out_interface='eth0')
     systemd.service(service='house_net.service', daemon_reload=True, enabled=True, running=True, restarted=True)
@@ -79,15 +72,10 @@
     if is_wifi:
         files.put(src="secrets/wpa_supplicant.conf", dest="/etc/wpa_supplicant/wpa_supplicant.conf")
 
-    # addr = host.host_data['addr']
-    # net = addr[:4]
-    # gateway = net + '.0.1'
-    # dns = gateway
-
     files.template(
         src="templates/net/singlenic.network.j2",
         dest="/etc/systemd/network/99-bigasterisk.network",
         create_remote_dir=True,
-        mac=host.host_data['mac'],
     )
-    systemd.service(service='systemd-networkd.service', enabled=True, running=True, restarted=True)
+
+systemd.service(service='systemd-networkd.service', enabled=True, running=True, restarted=True)
\ No newline at end of file