changeset 35:51c2f861764f

refactor
author drewp@bigasterisk.com
date Sat, 15 Jan 2022 15:41:01 -0800
parents d4fb38f13c79
children dc2100504c45
files net.py
diffstat 1 files changed, 19 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/net.py	Sat Jan 15 15:40:22 2022 -0800
+++ b/net.py	Sat Jan 15 15:41:01 2022 -0800
@@ -2,15 +2,12 @@
 from pyinfra.operations import apt, files, server, systemd
 
 is_wifi = host.name in ['frontdoor', 'living', 'plus']
+prime_public_addr = '162.243.138.136'
+prime_gateway = '162.243.138.1'
 
-if host.name in [
-        'garage',
-        'dash',
-        'slash',
-        'frontbed',
-        'prime',
-]:
-    # previous version
+
+def cleanup():
+    # past attempts
     files.file(path='/etc/netplan/99-pyinfra-written.yaml', present=False)
 
     for search_dir in [
@@ -26,13 +23,25 @@
             delete=True,
         )
 
+    apt.packages(packages=['network-manager'], present=False)
+
+
+if host.name in [
+        'garage',
+        'dash',
+        'slash',
+        'frontbed',
+        'prime',
+]:
+    cleanup()
+
     addr = host.host_data['addr']
     if addr.startswith('10.'):
         net = addr[:4]
         gateway = net + '.0.1'
         dns = gateway
-    elif addr == '162.243.138.136':
-        gateway = '162.243.138.1'
+    elif addr == prime_public_addr:
+        gateway = prime_gateway
         dns = '10.5.0.1 8.8.8.8 8.8.4.4'
     else:
         raise ValueError(addr)