From 8a1c6cffeac80ef8db05bc1e9547de833ba31f45 Mon Sep 17 00:00:00 2001 From: Olivier Leobal Date: Mon, 15 Jun 2015 12:56:03 +0200 Subject: [PATCH] Configuration clovis lite --- master/etc/default/snmpd | 2 +- master/etc/hosts.30MHzMDF | 86 +++++++++---------- master/etc/network/interfaces | 25 ++---- master/etc/snmp/snmpd.conf | 2 +- master/etc/webconfig/alias.csv | 18 ++-- .../additional_scripts/configure_fe306.sh | 2 +- .../additional_scripts/configure_matrix.tcl | 4 +- .../additional_scripts/configure_switch.tcl | 2 + .../configure_switch_bootstrap.tcl | 2 + 9 files changed, 67 insertions(+), 76 deletions(-) diff --git a/master/etc/default/snmpd b/master/etc/default/snmpd index 9fdb321..36b2d18 100644 --- a/master/etc/default/snmpd +++ b/master/etc/default/snmpd @@ -8,7 +8,7 @@ export MIBS= SNMPDRUN=yes # snmpd options (use syslog, close stdin/out/err). -SNMPDOPTS="-LS4d -Lf /dev/null -I -smux -p /var/run/snmpd.pid 127.0.0.1 10.133.28.160" +SNMPDOPTS="-LS4d -Lf /dev/null -I -smux -p /var/run/snmpd.pid 127.0.0.1 10.133.26.160 10.133.28.160" # snmptrapd control (yes means start daemon). As of net-snmp version # 5.0, master agentx support must be enabled in snmpd before snmptrapd diff --git a/master/etc/hosts.30MHzMDF b/master/etc/hosts.30MHzMDF index 7e20f7e..2990659 100644 --- a/master/etc/hosts.30MHzMDF +++ b/master/etc/hosts.30MHzMDF @@ -13,49 +13,49 @@ ff02::3 ip6-allhosts # =============================== 10.133.26.160 trc00 maitre sup fusion nfsserver -10.133.26.161 trc01 lsu -10.133.26.162 trc02 gon00 -10.133.26.163 trc03 gon01 -10.133.26.164 trc04 gon02 -10.133.26.165 trc05 gon03 -10.133.26.166 trc06 gon04 -10.133.26.167 trc07 gon05 -10.133.26.168 trc08 gon06 -10.133.26.169 trc09 gon07 -10.133.26.170 trc10 gon08 -10.133.26.171 trc11 gon09 -10.133.26.172 trc12 gon10 -10.133.26.173 trc13 gon11 -10.133.26.174 trc14 gon12 -10.133.26.175 trc15 gon13 -10.133.26.176 trc16 gon14 -10.133.26.177 trc17 gon15 -10.133.26.178 trc18 gon16 -10.133.26.179 trc19 gon17 -10.133.26.180 trc20 gon18 -10.133.26.181 trc21 gon19 -10.133.26.182 trc22 gon20 -10.133.26.183 trc23 gon21 -10.133.26.184 trc24 gon22 -10.133.26.185 trc25 gon23 -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.161 trc01 +10.133.26.162 trc02 lsu +10.133.26.163 trc03 +10.133.26.164 trc04 gon00 +10.133.26.165 trc05 gon01 +10.133.26.166 trc06 gon02 +10.133.26.167 trc07 gon03 +10.133.26.168 trc08 gon04 +10.133.26.169 trc09 gon05 +10.133.26.170 trc10 gon06 +10.133.26.171 trc11 gon07 +10.133.26.172 trc12 gon08 +10.133.26.173 trc13 gon09 +10.133.26.174 trc14 gon10 +10.133.26.175 trc15 gon11 +10.133.26.176 trc16 gon12 +10.133.26.177 trc17 gon13 +10.133.26.178 trc18 gon14 +10.133.26.179 trc19 gon15 +10.133.26.180 trc20 gon16 +10.133.26.181 trc21 gon17 +10.133.26.182 trc22 gon18 +10.133.26.183 trc23 gon19 +10.133.26.184 trc24 gon20 +10.133.26.185 trc25 gon21 +10.133.26.186 trc26 gon22 +10.133.26.187 trc27 gon23 +10.133.26.188 trc28 gon24 +10.133.26.189 trc29 gon25 +10.133.26.190 trc30 gon26 +10.133.26.191 trc31 gon27 +10.133.26.192 trc32 gon28 +10.133.26.193 trc33 gon29 +10.133.26.194 trc34 gon30 +10.133.26.195 trc35 gon31 +10.133.26.196 trc36 mon00 +10.133.26.197 trc37 +10.133.26.198 trc38 mon01 +10.133.26.199 trc39 10.133.26.231 swg swg1 10.133.26.232 swg2 -# =============================== -# Reseau 10.133.28.0 -# =============================== - # prod fe306 1 110->118 10.133.26.110 fe306-1 # prod fe306 2 120->128 @@ -67,10 +67,10 @@ ff02::3 ip6-allhosts # prod fe306 5 150->158 10.133.26.150 fe306-5 -10.133.28.159 amm00 -10.133.28.158 amm01 +10.133.26.159 amm00 +10.133.26.158 amm01 -10.133.28.253 matrix -10.133.28.254 gps +10.133.26.253 matrix +10.133.26.254 gps 100.100.100.101 tmt diff --git a/master/etc/network/interfaces b/master/etc/network/interfaces index 6b46af3..ea34ae7 100644 --- a/master/etc/network/interfaces +++ b/master/etc/network/interfaces @@ -15,21 +15,10 @@ iface eth0 inet static 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 - post-up ip route add 238.0.0.0/24 dev eth0 - # FE306 pano - post-up ip route add 238.75.0.0/16 dev eth0 - # FE306 WP channels - # Pour prod voie PV 2eme octet vaut 111X XX11 (cf. libfreqplan/freqplancommon.h) - # => on met val de base vaut 224 (1110 0000) et mask a 224 (1110 0000) - # => 2eme octet associe aux valeurs de 224 a 255 - post-up ip route add 238.224.0.0/11 dev eth0 - # FE306 RF channels - # Pour prod voie RF 2eme octet vaut 110X XX11 (cf. libfreqplan/freqplancommon.h) - # => on met val de base vaut 192 (1100 0000) et mask a 224 (1110 0000) - # => 2eme octet associe aux valeurs de 192 a 223 - post-up ip route add 238.192.0.0/11 dev eth0 - # Delay line - post-up ip route add 239.0.0.0/8 dev eth0 + + +iface eth1 inet static + address 10.133.26.161 + netmask 255.255.255.0 + network 10.133.26.0 + broadcast 10.133.26.255 diff --git a/master/etc/snmp/snmpd.conf b/master/etc/snmp/snmpd.conf index 436f30d..7c6620d 100644 --- a/master/etc/snmp/snmpd.conf +++ b/master/etc/snmp/snmpd.conf @@ -191,7 +191,7 @@ linkUpDownNotifications yes # Listen for network connections (from localhost) # rather than the default named socket /var/agentx/master #agentXSocket tcp:localhost:705 -rwcommunity private 10.133.28.160 +rwcommunity private 10.133.26.160 rocommunity readall rwcommunity private localhost pass_persist -p 100 .1.3.6.1.4.1.50005.1 /usr/bin/perl -x/opt/trc6500/snmp/ /opt/trc6500/snmp/THALES-TRC6500.pl diff --git a/master/etc/webconfig/alias.csv b/master/etc/webconfig/alias.csv index e34a3bf..c15521e 100644 --- a/master/etc/webconfig/alias.csv +++ b/master/etc/webconfig/alias.csv @@ -40,15 +40,15 @@ ipmi;/usr/share/webconfig;;Configure IPMI for all Supermicro blades;sudo /opt/tr /dce;/usr/share/dce;/etc/dhcp/dhcpd.conf;DHCPD Configuration Editor;sudo service isc-dhcp-server restart ntp;/usr/share/webconfig;;Synchronize time and date on all blades;sudo /opt/trc6500/script/check_network.sh -c 'service chrony stop; ntpdate-debian; service chrony start' -o ;;;Internal equipements; -http://10.133.28.160:8110;/usr/share/webconfig;;FE306-1;:goto: -http://10.133.28.160:8120;/usr/share/webconfig;;FE306-2;:goto: -http://10.133.28.160:8130;/usr/share/webconfig;;FE306-3;:goto: -http://10.133.28.160:8140;/usr/share/webconfig;;FE306-4;:goto: -http://10.133.28.160:8150;/usr/share/webconfig;;FE306-5;:goto: -http://10.133.28.231;/usr/share/webconfig;;Switch Monitoring;:goto: -http://10.133.28.160:8231;/usr/share/webconfig;;Switch Gonio 1;:goto: -http://10.133.28.160:8232;/usr/share/webconfig;;Switch Gonio 2;:goto: -http://10.133.28.254;/usr/share/webconfig;;GPS;:goto: +http://10.133.26.160:8110;/usr/share/webconfig;;FE306-1;:goto: +http://10.133.26.160:8120;/usr/share/webconfig;;FE306-2;:goto: +http://10.133.26.160:8130;/usr/share/webconfig;;FE306-3;:goto: +http://10.133.26.160:8140;/usr/share/webconfig;;FE306-4;:goto: +http://10.133.26.160:8150;/usr/share/webconfig;;FE306-5;:goto: +http://10.133.26.231;/usr/share/webconfig;;Switch Monitoring;:goto: +http://10.133.26.160:8231;/usr/share/webconfig;;Switch Gonio 1;:goto: +http://10.133.26.160:8232;/usr/share/webconfig;;Switch Gonio 2;:goto: +http://10.133.26.254;/usr/share/webconfig;;GPS;:goto: ;;;TRC6500 MIB; /swb;/usr/share/swb;/var/cache/webconfig/snmp.tree;SNMP Web Browser;/opt/trc6500/bin/snmp-trc6500-walk|sed 's/enterprises\.thales\.//'>/var/cache/webconfig/snmp.tree ;;;Chassis actions; diff --git a/simple-cdd/additional_scripts/configure_fe306.sh b/simple-cdd/additional_scripts/configure_fe306.sh index a9de411..d0b685d 100755 --- a/simple-cdd/additional_scripts/configure_fe306.sh +++ b/simple-cdd/additional_scripts/configure_fe306.sh @@ -139,7 +139,7 @@ title "configure ip" configure ModeServ.cmd serv_mode MANUAL configure MacServ.cmd serv_mac 00.80.EE.00.$SN.01 -configure IpServ.cmd serv_ip 10.133.28.1${ID}0 +configure IpServ.cmd serv_ip 10.133.26.1${ID}0 configure MaskServ.cmd serv_mask 255.255.255.0 for i in $(seq 1 8); do diff --git a/simple-cdd/additional_scripts/configure_matrix.tcl b/simple-cdd/additional_scripts/configure_matrix.tcl index 0473f15..540c3d1 100755 --- a/simple-cdd/additional_scripts/configure_matrix.tcl +++ b/simple-cdd/additional_scripts/configure_matrix.tcl @@ -8,8 +8,6 @@ # creation script de configuration de la matrice par ligne de commande # ============================================================================ -set ipmaxtrix "10.133.28.253" - spawn /opt/trc6500/tools/matrix_tool set timeout 3 @@ -31,7 +29,7 @@ expect { "taper la commande choisie" { send "10\r" } } -expect "nouvelle adresse" { send "010.133.028.253\r" } +expect "nouvelle adresse" { send "010.133.026.253\r" } expect "taper la commande choisie" { send "12\r" } diff --git a/simple-cdd/additional_scripts/configure_switch.tcl b/simple-cdd/additional_scripts/configure_switch.tcl index 8e2af2f..7782906 100755 --- a/simple-cdd/additional_scripts/configure_switch.tcl +++ b/simple-cdd/additional_scripts/configure_switch.tcl @@ -21,6 +21,8 @@ set tftpserver "" if { $host == "swg1" } { set tftpserver "10.133.26.160" } if { $host == "swg2" } { set tftpserver "10.133.26.160" } if { $host == "swm" } { set tftpserver "10.133.28.160" } +if { $host == "sw1" } { set tftpserver "10.133.26.160" } +if { $host == "sw2" } { set tftpserver "10.133.26.160" } if { $tftpserver == "" } { puts "unknown switch '$host'"; exit } set date [ exec date +%Y%m%d-%H:%m:%S ] diff --git a/simple-cdd/additional_scripts/configure_switch_bootstrap.tcl b/simple-cdd/additional_scripts/configure_switch_bootstrap.tcl index 873b674..42fb513 100755 --- a/simple-cdd/additional_scripts/configure_switch_bootstrap.tcl +++ b/simple-cdd/additional_scripts/configure_switch_bootstrap.tcl @@ -10,6 +10,8 @@ set ipaddress "" if { $host == "swg1" } { set ipaddress "10.133.26.231" } if { $host == "swg2" } { set ipaddress "10.133.26.232" } if { $host == "swm" } { set ipaddress "10.133.28.231" } +if { $host == "sw1" } { set ipaddress "10.133.26.231" } +if { $host == "sw2" } { set ipaddress "10.133.26.232" } if { $ipaddress == "" } { puts "unknown switch '$host'""; exit 1 } spawn screen -c . /dev/ttyUSB0 -- 2.30.2