Configuration of 30MHz on 16 gon full duplex

diff --git a/master/etc/dhcp/dhcpd.conf.cl0 b/master/etc/dhcp/dhcpd.conf.cl0
index 44703096758d8f20dd18104d78557749f5418297..2e3f910f7200d921dd8b2b49f4c797ff4f6012d2 100644 (file)
--- a/master/etc/dhcp/dhcpd.conf.cl0
+++ b/master/etc/dhcp/dhcpd.conf.cl0
@@ -35,7 +35,7 @@ option domain-name "trc6500.thalesgroup.com";
 # Duree du bail en secondes
 default-lease-time 6000;
 max-lease-time 6000;
-server-name "maitre";
+server-name "master";
 
 # FIN des options GLOBALES
 
@@ -46,85 +46,47 @@ subnet 10.133.26.0 netmask 255.255.255.0
   next-server 10.133.26.160;
   filename "pxelinux.0";
   option domain-name-servers 10.133.26.160;
-  #option routers 10.133.26.231;
   use-host-decl-names on;
   authoritative;
 }
 
-# liste des lames a completer dans l'ordre de la baie
-
 #lame fusion, pistage, LSU
 host trc01 { hardware ethernet 00:25:90:8A:B2:08; fixed-address 10.133.26.161;}
 
 #lames gonio
 host trc02 { hardware ethernet 00:25:90:4F:1E:8C; fixed-address 10.133.26.162;}
-host trc03 { hardware ethernet 00:25:90:4F:23:9E; fixed-address 10.133.26.163;}
-host trc04 { hardware ethernet 00:25:90:4F:23:A4; fixed-address 10.133.26.164;}
-host trc05 { hardware ethernet 00:25:90:4F:18:62; fixed-address 10.133.26.165;}
-host trc06 { hardware ethernet 00:25:90:4F:18:58; fixed-address 10.133.26.166;}
-host trc07 { hardware ethernet 00:25:90:4F:1A:28; fixed-address 10.133.26.167;}
-host trc08 { hardware ethernet 00:25:90:4F:BB:72; fixed-address 10.133.26.168;}
-host trc09 { hardware ethernet 00:25:90:4F:BB:22; fixed-address 10.133.26.169;}
-host trc10 { hardware ethernet 00:25:90:4F:BA:F2; fixed-address 10.133.26.170;}
-host trc11 { hardware ethernet 00:25:90:4F:BA:F0; fixed-address 10.133.26.171;}
-host trc12 { hardware ethernet 00:25:90:4f:bb:1e; fixed-address 10.133.26.172;}
-host trc13 { hardware ethernet 00:25:90:4F:23:D4; fixed-address 10.133.26.173;}
-host trc14 { hardware ethernet 00:25:90:4F:23:Dc; fixed-address 10.133.26.174;}
-host trc15 { hardware ethernet 00:25:90:4F:BB:20; fixed-address 10.133.26.175;}
-host trc16 { hardware ethernet 00:25:90:4F:E1:66; fixed-address 10.133.26.176;}
-host trc17 { hardware ethernet 00:25:90:4F:EA:20; fixed-address 10.133.26.177;}
-host trc18 { hardware ethernet 00:25:90:4F:E2:D2; fixed-address 10.133.26.178;}
-host trc19 { hardware ethernet 00:25:90:4F:EF:00; fixed-address 10.133.26.179;}
-host trc20 { hardware ethernet 00:25:90:4F:E8:0A; fixed-address 10.133.26.180;}
-host trc21 { hardware ethernet 00:25:90:4F:C3:3C; fixed-address 10.133.26.181;}
-host trc22 { hardware ethernet 00:25:90:4F:BB:68; fixed-address 10.133.26.182;}
-host trc23 { hardware ethernet 00:25:90:4F:E1:62; fixed-address 10.133.26.183;}
-host trc24 { hardware ethernet 00:25:90:4F:e4:86; fixed-address 10.133.26.184;}
-host trc25 { hardware ethernet 00:25:90:4F:bb:74; fixed-address 10.133.26.185;}
+host trc03 { hardware ethernet 00:25:90:4F:1E:8D; fixed-address 10.133.26.163;}
+host trc04 { hardware ethernet 00:25:90:4F:23:9E; fixed-address 10.133.26.164;}
+host trc05 { hardware ethernet 00:25:90:4F:23:9F; fixed-address 10.133.26.165;}
+host trc06 { hardware ethernet 00:25:90:4F:23:A4; fixed-address 10.133.26.166;}
+host trc07 { hardware ethernet 00:25:90:4F:23:A5; fixed-address 10.133.26.167;}
+host trc08 { hardware ethernet 00:25:90:4F:18:62; fixed-address 10.133.26.168;}
+host trc09 { hardware ethernet 00:25:90:4F:18:63; fixed-address 10.133.26.169;}
+host trc10 { hardware ethernet 00:25:90:4F:18:58; fixed-address 10.133.26.170;}
+host trc11 { hardware ethernet 00:25:90:4F:18:59; fixed-address 10.133.26.171;}
+host trc12 { hardware ethernet 00:25:90:4F:1A:28; fixed-address 10.133.26.172;}
+host trc13 { hardware ethernet 00:25:90:4F:1A:29; fixed-address 10.133.26.173;}
+host trc14 { hardware ethernet 00:25:90:4F:BB:72; fixed-address 10.133.26.174;}
+host trc15 { hardware ethernet 00:25:90:4F:BB:73; fixed-address 10.133.26.175;}
+host trc16 { hardware ethernet 00:25:90:4F:BB:22; fixed-address 10.133.26.176;}
+host trc17 { hardware ethernet 00:25:90:4F:BB:23; fixed-address 10.133.26.177;}
+host trc18 { hardware ethernet 00:25:90:4F:BA:F2; fixed-address 10.133.26.178;}
+host trc19 { hardware ethernet 00:25:90:4F:BA:F3; fixed-address 10.133.26.179;}
+host trc20 { hardware ethernet 00:25:90:4F:BA:F0; fixed-address 10.133.26.180;}
+host trc21 { hardware ethernet 00:25:90:4F:BA:F1; fixed-address 10.133.26.181;}
+host trc22 { hardware ethernet 00:25:90:4f:bb:1e; fixed-address 10.133.26.182;}
+host trc23 { hardware ethernet 00:25:90:4f:bb:1f; fixed-address 10.133.26.183;}
+host trc24 { hardware ethernet 00:25:90:4F:23:D4; fixed-address 10.133.26.184;}
+host trc25 { hardware ethernet 00:25:90:4F:23:D5; fixed-address 10.133.26.185;}
+host trc26 { hardware ethernet 00:25:90:4F:23:Dc; fixed-address 10.133.26.186;}
+host trc27 { hardware ethernet 00:25:90:4F:23:DD; fixed-address 10.133.26.187;}
+host trc28 { hardware ethernet 00:25:90:4F:BB:20; fixed-address 10.133.26.188;}
+host trc29 { hardware ethernet 00:25:90:4F:BB:21; fixed-address 10.133.26.189;}
+host trc30 { hardware ethernet 00:25:90:4F:E1:66; fixed-address 10.133.26.190;}
+host trc31 { hardware ethernet 00:25:90:4F:E1:67; fixed-address 10.133.26.191;}
+host trc32 { hardware ethernet 00:25:90:4F:EA:20; fixed-address 10.133.26.192;}
+host trc33 { hardware ethernet 00:25:90:4F:EA:21; fixed-address 10.133.26.193;}
 
 #lames monitoring
-host trc26 { hardware ethernet 00:25:90:4F:BB:6E; fixed-address 10.133.26.186;}
-host trc27 { hardware ethernet 00:25:90:4F:BB:66; fixed-address 10.133.26.187;}
-
-host trc28 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.188;}
-host trc29 { hardware ethernet 00:00:00:00:00:02; fixed-address 10.133.26.189;}
-host trc30 { hardware ethernet 00:00:00:00:00:03; fixed-address 10.133.26.190;}
-host trc31 { hardware ethernet 00:25:90:88:E3:C2; fixed-address 10.133.26.191;}
-
-#lame fusion, pistage, LSU
-#host trc01 { hardware ethernet 00:25:90:8A:B2:09; fixed-address 10.133.28.161;}
-
-#lames gonio
-#host trc02 { hardware ethernet 00:25:90:4F:1E:8D; fixed-address 10.133.28.162;}
-#host trc03 { hardware ethernet 00:25:90:4F:23:9F; fixed-address 10.133.28.163;}
-#host trc04 { hardware ethernet 00:25:90:4F:23:A5; fixed-address 10.133.28.164;}
-#host trc05 { hardware ethernet 00:25:90:4F:18:63; fixed-address 10.133.28.165;}
-#host trc06 { hardware ethernet 00:25:90:4F:18:59; fixed-address 10.133.28.166;}
-#host trc07 { hardware ethernet 00:25:90:4F:1A:29; fixed-address 10.133.28.167;}
-#host trc08 { hardware ethernet 00:25:90:4F:BB:73; fixed-address 10.133.28.168;}
-#host trc09 { hardware ethernet 00:25:90:4F:BB:23; fixed-address 10.133.28.169;}
-#host trc10 { hardware ethernet 00:25:90:4F:BA:F3; fixed-address 10.133.28.170;}
-#host trc11 { hardware ethernet 00:25:90:4F:BA:F1; fixed-address 10.133.28.171;}
-#host trc12 { hardware ethernet 00:25:90:4f:bb:1f; fixed-address 10.133.28.172;}
-#host trc13 { hardware ethernet 00:25:90:4F:23:D5; fixed-address 10.133.28.173;}
-#host trc14 { hardware ethernet 00:25:90:4F:23:DD; fixed-address 10.133.28.174;}
-#host trc15 { hardware ethernet 00:25:90:4F:BB:21; fixed-address 10.133.28.175;}
-#host trc16 { hardware ethernet 00:25:90:4F:E1:67; fixed-address 10.133.28.176;}
-#host trc17 { hardware ethernet 00:25:90:4F:EA:21; fixed-address 10.133.28.177;}
-#host trc18 { hardware ethernet 00:25:90:4F:E2:D3; fixed-address 10.133.28.178;}
-#host trc19 { hardware ethernet 00:25:90:4F:EF:01; fixed-address 10.133.28.179;}
-#host trc20 { hardware ethernet 00:25:90:4F:E8:0B; fixed-address 10.133.28.180;}
-#host trc21 { hardware ethernet 00:25:90:4F:C3:3D; fixed-address 10.133.28.181;}
-#host trc22 { hardware ethernet 00:25:90:4F:BB:69; fixed-address 10.133.28.182;}
-#host trc23 { hardware ethernet 00:25:90:4F:E1:63; fixed-address 10.133.28.183;}
-#host trc24 { hardware ethernet 00:25:90:4F:e4:87; fixed-address 10.133.28.184;}
-#host trc25 { hardware ethernet 00:25:90:4F:bb:75; fixed-address 10.133.28.185;}
-
-#lames monitoring
-#host trc26 { hardware ethernet 00:25:90:4F:BB:6F; fixed-address 10.133.28.186;}
-#host trc27 { hardware ethernet 00:25:90:4F:BB:67; fixed-address 10.133.28.187;}
-
-#host trc28 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.188;}
-#host trc29 { hardware ethernet 00:00:00:00:00:02; fixed-address 10.133.26.189;}
-#host trc30 { hardware ethernet 00:00:00:00:00:03; fixed-address 10.133.26.190;}
-#host trc31 { hardware ethernet 00:25:90:88:E3:C3; fixed-address 10.133.28.191;}
+host trc34 { hardware ethernet 00:25:90:4F:E2:D2; fixed-address 10.133.26.194;}
+host trc35 { hardware ethernet 00:25:90:4F:EF:00; fixed-address 10.133.26.195;}

diff --git a/master/etc/hosts.30MHzMDF b/master/etc/hosts.30MHzMDF
index 638e5a6825dd805686606c37cd10f29c09fe61af..7e20f7e5d264c9b70bcb958468f0c85aa8ee703f 100644 (file)
--- a/master/etc/hosts.30MHzMDF
+++ b/master/etc/hosts.30MHzMDF
@@ -38,8 +38,16 @@ ff02::3 ip6-allhosts
 10.133.26.183  trc23 gon21
 10.133.26.184  trc24 gon22
 10.133.26.185  trc25 gon23
-10.133.26.186  trc26 mon00
-10.133.26.187  trc27 mon01
+10.133.26.186  trc26 gon24
+10.133.26.187  trc27 gon25
+10.133.26.188  trc28 gon26
+10.133.26.189  trc29 gon27
+10.133.26.190  trc30 gon28
+10.133.26.191  trc31 gon29
+10.133.26.192  trc32 gon30
+10.133.26.193  trc33 gon31
+10.133.26.194  trc34 mon00
+10.133.26.195  trc35 mon01
 
 10.133.26.231   swg swg1
 10.133.26.232   swg2

diff --git a/master/etc/initramfs-tools/scripts/tftp b/master/etc/initramfs-tools/scripts/tftp
index 6847ffb561cc3b024e0540773eac089f2d1308c4..4877c9cd31b69d4219dcafea8b29120a249d837a 100644 (file)
--- a/master/etc/initramfs-tools/scripts/tftp
+++ b/master/etc/initramfs-tools/scripts/tftp
@@ -4,6 +4,7 @@ mountroot ()
 {
     # configure ethernet
     ipconfig -c dhcp eth0
+    ipconfig -t 90 -c dhcp eth1
 
     mount -t ramfs /dev/ram0 ${rootmnt}
 

diff --git a/master/etc/network/interfaces b/master/etc/network/interfaces
index a8c838a5419ed6c76de4ec1f46862c88d9a33ae6..6b46af357e1f889193ec1be56e124e34bf6f7a75 100644 (file)
--- a/master/etc/network/interfaces
+++ b/master/etc/network/interfaces
@@ -14,6 +14,7 @@ iface eth0 inet static
        broadcast 10.133.26.255
        pre-up ip addr flush dev eth0
        post-up ip addr add 10.133.28.160/24 dev eth0
+       post-up ip route add default dev eth0
        # Sensor prod
        post-up ip route add 225.0.0.0/8 dev eth0
        # FE306 authentification

diff --git a/master/opt/cluster/slave/etc/network/interfaces b/master/opt/cluster/slave/etc/network/interfaces
index c65d7466e3a4963761c84a6758794def43cc1e5f..c9960515527560971f737e2b48cbb7a5e30528bf 100644 (file)
--- a/master/opt/cluster/slave/etc/network/interfaces
+++ b/master/opt/cluster/slave/etc/network/interfaces
@@ -27,3 +27,7 @@ iface eth0 inet dhcp
        post-up ip route add 238.0.0.0/24 dev eth0
        # Sensor prod
        post-up ip route add 225.0.0.0/8 dev eth0
+
+auto eth1
+iface eth1 inet dhcp
+

diff --git a/master/opt/cluster/slave/etc/rc.local b/master/opt/cluster/slave/etc/rc.local
index 37c199c94e4e2614a38938d20f1de53c7130d719..563698d0bf4d39777571457c9781530eac98af42 100755 (executable)
--- a/master/opt/cluster/slave/etc/rc.local
+++ b/master/opt/cluster/slave/etc/rc.local
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/bash -e
 #
 # rc.local
 #
@@ -12,7 +12,16 @@
 # By default this script does nothing.
 
 for i in $(seq 1 25); do
-       echo TRC6500
+  echo TRC6500
+done
+
+# distribute interrupt for eth0 on core 1-6
+core=(2 4 8 10 20 40)
+l=0
+for i in $(awk '/eth0/ {sub(/:/, ""); print $1}' /proc/interrupts); do
+  echo ${core[$l]} > /proc/irq/$i/smp_affinity
+  let l++
+  [ $l -eq 6 ] && l=1
 done
 
 exit 0