diff --git a/groups/os/routeros.py b/groups/os/routeros.py index b44aed7..b914191 100644 --- a/groups/os/routeros.py +++ b/groups/os/routeros.py @@ -28,6 +28,7 @@ 'wokeonlan': '5', 'gast': '9', 'rolf': '51', + 'carina': '52', }, 'vlan_groups': { 'home': { @@ -43,6 +44,7 @@ 'gast', 'rolf', 'wokeonlan', + 'carina', }, }, 'internet': { @@ -53,6 +55,10 @@ 'untagged': 'wokeonlan', 'tagged': set(), }, + 'carina': { + 'untagged': 'carina', + 'tagged': set(), + }, }, 'vlan_ports': {}, }, diff --git a/nodes/home.router.py b/nodes/home.router.py index 01235a0..8834dab 100644 --- a/nodes/home.router.py +++ b/nodes/home.router.py @@ -11,7 +11,7 @@ 'bundles': [ 'kea-dhcpd', 'wireguard', - 'pppoe', + #'pppoe', 'wol-waker', ], 'metadata': { @@ -57,12 +57,29 @@ 'ipv4': '10.0.9.1/24', 'dhcp_server': True, }, - 'rolf': { # rolf local test + # 'rolf': { # rolf local test + # 'type': 'vlan', + # 'vlan_interface': 'internal', + # 'id': 51, + # 'ipv4': '192.168.179.1/24', + # 'dhcp_server': True, + # }, + 'carina': { # NOTFALL 'type': 'vlan', 'vlan_interface': 'internal', - 'id': 51, - 'ipv4': '192.168.179.1/24', - 'dhcp_server': True, + 'id': 52, + 'ipv4': '192.168.178.199/24', + 'gateway4': '192.168.178.1', + }, + # 'carina': { + # 'interface': 'enp1s0f1', + # 'ipv4': '192.168.178.199/24', + # 'gateway4': '192.168.178.1', + # }, + }, + 'nftables': { + 'nat': { + 'oifname carina masquerade', }, }, 'bind': { diff --git a/nodes/home.switch-rack-10g.py b/nodes/home.switch-rack-10g.py index 2e190ff..af5e968 100644 --- a/nodes/home.switch-rack-10g.py +++ b/nodes/home.switch-rack-10g.py @@ -37,7 +37,8 @@ 'vlan_group': 'home', }, 'sfp-sfpplus7': { - 'vlan_group': 'home', + 'vlan_group': 'carina', + 'comment': 'CARINA', }, 'sfp-sfpplus8': { 'vlan_group': 'infra',