bht, jup: fix routing

This fixes the routing in the triangle bht<->jup<->segen and also
assures that bht routes via perleberger36->strom instead of using
segen->saarbruecker or chris/mela->teufelsberg->ak36.

locations/bht.yml

@@ -140,6 +140,7 @@ networks:
     prefix: 10.230.23.128/32
     ipv6_subprefix: -10
     ptp: true
+    # Prefer routing via perleberger36 over segen
     mesh_metric: 1024
     mesh_metric_lqm: ['default 0.2']
 
@@ -149,6 +150,9 @@ networks:
     prefix: 10.230.23.129/32
     ipv6_subprefix: -11
     ptp: true
+    # Prefer routing via perleberger36 over segen, chris, mela
+    mesh_metric: 256
+
 
   - vid: 12
     role: mesh
@@ -173,6 +177,9 @@ networks:
     name: mesh_jup
     prefix: 10.230.23.133/32
     ipv6_subprefix: -15
+    # Set metrics similar as for mesh_segen so path via jup is always worse
+    mesh_metric: 1024
+    mesh_metric_lqm: ['default 0.25']
 
   - vid: 16
     role: mesh

locations/jup.yml

@@ -65,8 +65,6 @@ networks:
     name: mesh_bht
     prefix: 10.31.147.128/32
     ipv6_subprefix: -1
-    mesh_metric: 1024
-    mesh_metric_lqm: ['default 0.5']
     ptp: true
 
   - vid: 11