philmel: reorder networks and devices

locations/philmel.yml

@@ -1,6 +1,6 @@
 ---
 location: philmel
-location_nice: Philipp-Melanchthon-Kirche
+location_nice: Philipp-Melanchthon-Kirche, Kranoldstraße 16, 12051 Berlin
 latitude: 52.465881
 longitude: 13.434112
 altitude: 83
@@ -9,166 +9,231 @@ community: true
 hosts:
   - hostname: philmel-core
     role: corerouter
-    model: "linksys_e8450-ubi"
+    model: "mikrotik_routerboard-750gr3"
     wireless_profile: freifunk_default
-  - hostname: philmel-nord-m2
+
+  # This section contains nearfield devices
+  - hostname: philmel-nf-o-5ghz
     role: ap
-    model: "ubnt_nanostation-m2_xm"
-    wireless_profile: freifunk_default
+    model: "mikrotik_sxtsq-5-ac"
+    mac_override: {eth0: TODO}
+
+  # TODO: For the peer GSBS2 802.11s is not working
+  # TODO: Provide AP with mesh for GSBS2
+  - hostname: philmel-nf-s-5ghz  # peers: GSBS2
+    role: ap
+    model: "mikrotik_sxtsq-5-ac"
+    mac_override: {eth0: dc:2c:6e:c4:36:53}
+
+  - hostname: philmel-nf-w-5ghz
+    role: ap
+    model: "mikrotik_sxtsq-5-ac"
+    mac_override: {eth0: TODO}
 
 snmp_devices:
-  - hostname: philmel-rhnk
-    address: 10.230.2.4
+  - hostname: philmel-switch
+    address: 10.230.2.2
+    snmp_profile: swos
+
+  - hostname: philmel-klunker
+    address: 10.230.2.3
     snmp_profile: af60
-  - hostname: philmel-nord-5ghz
+
+  - hostname: philmel-ak36
+    address: 10.230.2.4
+    snmp_profile: airos_8
+
+  - hostname: philmel-nw-60ghz
+    address: 10.230.2.5
+    snmp_profile: mikrotik_60g
+
+  - hostname: philmel-no-5ghz
     address: 10.230.2.6
     snmp_profile: airos_8
-  - hostname: philmel-ost
+
+  - hostname: philmel-nw-5ghz
     address: 10.230.2.7
-    snmp_profile: airos_6
-  - hostname: philmel-vaterhaus
+    snmp_profile: airos_8
+
+  - hostname: philmel-o-5ghz
     address: 10.230.2.8
     snmp_profile: airos_8
-  - hostname: philmel-sued
+
+  - hostname: philmel-s-5ghz
     address: 10.230.2.9
-    snmp_profile: airos_6
-  - hostname: philmel-sued-5ac
-    address: 10.230.2.10
     snmp_profile: airos_8
-  - hostname: philmel-west
-    address: 10.230.2.11
-    snmp_profile: airos_6
-  - hostname: philmel-ak36
-    address: 10.230.2.12
+
+  - hostname: philmel-w-5ghz
+    address: 10.230.2.10
     snmp_profile: airos_8
 
 airos_dfs_reset:
   - name: "philmel-ak36"
-    target: "10.230.2.12"
+    target: "10.230.2.4"
     username: "ubnt"
-    password: "file:/root/pwd.txt"
+    password: "file:/root/pwd"
     daytime_limit: "2-7"
-  - name: "philmel-nord-5ac"
+
+  - name: "philmel-no-5ghz"
     target: "10.230.2.6"
     username: "ubnt"
-    password: "file:/root/pwd.txt"
+    password: "file:/root/pwd"
+    daytime_limit: "2-7"
+
+  - name: "philmel-nw-5ghz"
+    target: "10.230.2.7"
+    username: "ubnt"
+    password: "file:/root/pwd"
+    daytime_limit: "2-7"
+
+  - name: "philmel-o-5ghz"
+    target: "10.230.2.8"
+    username: "ubnt"
+    password: "file:/root/pwd"
+    daytime_limit: "2-7"
+
+  - name: "philmel-s-5ghz"
+    target: "10.230.2.9"
+    username: "ubnt"
+    password: "file:/root/pwd"
+    daytime_limit: "2-7"
+
+  - name: "philmel-w-5ghz"
+    target: "10.230.2.10"
+    username: "ubnt"
+    password: "file:/root/pwd"
     daytime_limit: "2-7"
 
-# got following prefixes:
-# Router: 10.230.2.0/24
-# --MGMT: 10.230.2.0/28
-# --MESH: 10.31.215.32/27 (-23)
-# --DHCP: 10.230.2.32/28
+# ROUTER: 10.230.2.0/24
+# --MGMT: 10.230.2.0/27
+# --MESH: 10.230.2.32/27
+# --FREE: 10.230.2.64/27
+# --DHCP: 10.230.2.128/25
+
+# TODO:give back old IP
+# --MESH: 10.31.215.32/27
 
 ipv6_prefix: "2001:bf7:820:1500::/56"
 
 networks:
-  - vid: 2
-    role: dhcp
-    prefix: 10.230.2.32/28
-    ipv6_subprefix: 0
-    untagged: true
-    inbound_filtering: true
-    enforce_client_isolation: true
-    assignments:
-      philmel-core: 1
-
-  # northeast mesh 5GHz ac
   - vid: 10
     role: mesh
-    name: mesh_no_5ghz         # Peers: kiehlufer-core
-    prefix: 10.230.2.17/32
-    ipv6_subprefix: -1
-    mesh_metric: 1024
+    name: mesh_klunker
+    prefix: 10.230.2.32/32
+    ipv6_subprefix: -10
+    ptp: true
+    mesh_metric: 256
 
-  # northwest mesh 5GHz ac
   - vid: 11
     role: mesh
-    name: mesh_nw_5ghz          # Peers: liegewiese, sgfrd-core
-    prefix: 10.230.2.18/32
-    ipv6_subprefix: -2
+    name: mesh_ak36
+    prefix: 10.230.2.33/32
+    ipv6_subprefix: -11
+    ptp: true
     mesh_metric: 1024
+    mesh_metric_lqm: ['default 0.3']
 
   - vid: 12
     role: mesh
-    name: mesh_ost            # Peers: Area51, delbrueck66
-    prefix: 10.230.2.19/32
-    ipv6_subprefix: -3
-    mesh_metric: 1024
+    name: mesh_nw_60ghz
+    prefix: 10.230.2.34/32
+    ipv6_subprefix: -12
 
+  # northeast mesh 5GHz ac
   - vid: 13
     role: mesh
-    name: mesh_vaterhaus
-    prefix: 10.230.2.20/32
-    ipv6_subprefix: -4
-    mesh_metric: 1024
+    name: mesh_no_5ghz
+    prefix: 10.230.2.35/32
+    ipv6_subprefix: -13
 
+  # northwest mesh 5GHz ac
   - vid: 14
     role: mesh
-    name: mesh_sued           # Peers: kranold18, GSBS2
-    prefix: 10.230.2.21/32
-    ipv6_subprefix: -5
-    mesh_metric: 1024
+    name: mesh_nw_5ghz
+    prefix: 10.230.2.36/32
+    ipv6_subprefix: -14
 
   - vid: 15
     role: mesh
-    name: mesh_sued_5ghz
-    prefix: 10.230.2.22/32
-    ipv6_subprefix: -6
-    mesh_metric: 1024
+    name: mesh_o_5ghz
+    prefix: 10.230.2.37/32
+    ipv6_subprefix: -15
 
   - vid: 16
     role: mesh
-    name: mesh_west           # Peers: emser97
-    prefix: 10.230.2.23/32
-    ipv6_subprefix: -7
-    mesh_metric: 1024
+    name: mesh_s_5ghz
+    prefix: 10.230.2.38/32
+    ipv6_subprefix: -16
 
   - vid: 17
     role: mesh
-    name: mesh_ak36
-    prefix: 10.230.2.24/32
-    ipv6_subprefix: -8
-    ptp: true
-    mesh_metric: 1024
-    mesh_metric_lqm: ['default 0.3']  # prefer klunker link
+    name: mesh_w_5ghz
+    prefix: 10.230.2.39/32
+    ipv6_subprefix: -17
 
-  - vid: 18
+    # TODO: add nearfield aps for meshing
+  - vid: 20
     role: mesh
-    name: mesh_klunker
-    prefix: 10.230.2.25/32
-    ipv6_subprefix: -9
-    ptp: true
-    mesh_metric: 128
-
-  - vid: 19
+    name: mesh_nf_o_5
+    prefix: 10.230.2.40/32
+    ipv6_subprefix: -20
+    mesh_ap: philmel-nf-o-5ghz
+    mesh_radio: 11a_standard
+    mesh_iface: mesh
+
+  - vid: 21
     role: mesh
-    name: mesh_nw_60ghz
-    prefix: 10.230.2.26/32
-    ipv6_subprefix: -10
-    ptp: true
-    mesh_metric: 1024
+    name: mesh_nf_s_5
+    prefix: 10.230.2.41/32
+    ipv6_subprefix: -21
+    mesh_ap: philmel-nf-s-5ghz
+    mesh_radio: 11a_standard
+    mesh_iface: mesh
+
+  - vid: 22
+    role: mesh
+    name: mesh_nf_w_5
+    prefix: 10.230.2.42/32
+    ipv6_subprefix: -22
+    mesh_ap: philmel-nf-w-5ghz
+    mesh_radio: 11a_standard
+    mesh_iface: mesh
+
+  - vid: 40
+    role: dhcp
+    prefix: 10.230.2.32/28
+    ipv6_subprefix: 0
+    untagged: true
+    inbound_filtering: true
+    enforce_client_isolation: true
+    assignments:
+      philmel-core: 1
 
-  - vid: 42
+  # TODO: Change on all devices (mgmt vlan)
+  - vid: 438
     role: mgmt
-    prefix: 10.230.2.0/28
+    prefix: 10.230.2.0/27
     gateway: 1
     dns: 1
     ipv6_subprefix: 1
     assignments:
+      # core devices
       philmel-core: 1
-      philmel-switch-1: 2
-      philmel-switch-2: 3
-      philmel-klunker: 4
-      philmel-no-5ghz: 5
-      philmel-nw-5ghz: 6
-      philmel-ost-legacy: 7
-      philmel-vaterhaus: 8
-      philmel-sued-legacy: 9
-      philmel-sued-5ghz: 10
-      philmel-ak36: 12
-      philmel-west-legacy: 11
-      philmel-nw-60ghz: 14
+      philmel-switch: 2
+      # PtP
+      philmel-klunker: 3
+      philmel-ak36: 4
+      # PtmP
+      philmel-nw-60ghz: 5
+      philmel-no-5ghz: 6
+      philmel-nw-5ghz: 7
+      philmel-o-5ghz: 8
+      philmel-s-5ghz: 9
+      philmel-w-5ghz: 10
+      # nearfield devices
+      philmel-nf-o-5ghz: 11
+      philmel-nf-s-5ghz: 12
+      philmel-nf-w-5ghz: 13
 
 location__ssh_keys__to_merge:
   - comment: roedel