From 3a8d2b2fc527b9194dd3e37519b27102ba1333c7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20P=C3=A9rennou=20=28Viveris=20Technologies=29?= Date: Mon, 22 Jun 2015 14:55:29 +0200 Subject: [PATCH] Keep standard 30MHzDF and adds the lite configuration --- install_debian.txt | 8 +- master/etc/dhcp/dhcpd.conf.blank.lite | 78 ++++ master/etc/dhcp/dhcpd.conf.cl0 | 120 ++++-- master/etc/dhcp/dhcpd.conf.cl0.lite | 95 +++++ master/etc/hosts.30MHzMDF | 121 +++--- master/etc/hosts.30MHzMDF.lite | 72 ++++ master/etc/webconfig/alias.csv | 7 + .../opt/cluster/slave/etc/network/interfaces | 19 +- master/opt/tftp/sw1.txt | 357 ++++++++++++++++++ master/opt/tftp/sw2.txt | 357 ++++++++++++++++++ master/opt/tftp/swg1.txt | 133 +++---- master/opt/tftp/swg2.txt | 33 +- master/opt/tftp/swm.txt | 11 +- ...ration.tcl => conf_switch_integration.tcl} | 6 +- .../deploiement_conf_reseau_integration.sh | 2 +- .../change_configuration.sh | 7 +- .../additional_scripts/configure_switch.tcl | 2 +- .../configure_switch_bootstrap.tcl | 2 +- simple-cdd/additional_scripts/cpumon_lite | 27 ++ simple-cdd/deb_build/debian/debian-changelog | 6 + simple-cdd/profiles/trc6500.preseed | 4 +- 21 files changed, 1252 insertions(+), 215 deletions(-) create mode 100644 master/etc/dhcp/dhcpd.conf.blank.lite create mode 100644 master/etc/dhcp/dhcpd.conf.cl0.lite create mode 100644 master/etc/hosts.30MHzMDF.lite create mode 100644 master/opt/tftp/sw1.txt create mode 100644 master/opt/tftp/sw2.txt rename master/root/bin/{conf_swm_integration.tcl => conf_switch_integration.tcl} (97%) create mode 100644 simple-cdd/additional_scripts/cpumon_lite diff --git a/install_debian.txt b/install_debian.txt index c44aee3..91ff753 100644 --- a/install_debian.txt +++ b/install_debian.txt @@ -2,7 +2,7 @@ Step 1: Minimalist Debian install * locale: English/US * timezone: France * keboard: French -* eth1 / 10.133.28.160 / 255.255.255.0 / 10.133.28.231 / no dns +* eth1 / 10.133.26.160 / 255.255.255.0 / 10.133.26.231 / no dns * hostname: trc00.thalesgroup.com * root password: thales * local user: trc6500 @@ -23,7 +23,7 @@ Step 2: First configuration aptitude install openssh-server rsync eject * on server - ~/debian6500/master/opt/cluster/bin/sync_master.sh 10.133.28.160 + ~/debian6500/master/opt/cluster/bin/sync_master.sh 10.133.26.160 * on blade mount -a mv /home /var/media/backup @@ -34,12 +34,12 @@ Step 2: First configuration Step 3: * on server ## restore network connection - cat ~trc6500/ftp/TRC6500.pub | ssh root@10.133.28.160 apt-key add - + cat ~trc6500/ftp/TRC6500.pub | ssh root@10.133.26.160 apt-key add - * on blade aptitude update aptitude install $(cat /root/debian-list.txt) * on server - ~/debian6500/master/opt/cluster/bin/sync_master.sh 10.133.28.160 + ~/debian6500/master/opt/cluster/bin/sync_master.sh 10.133.26.160 * on blade update-rc.d waitswitches defaults update-rc.d waitswitches enable diff --git a/master/etc/dhcp/dhcpd.conf.blank.lite b/master/etc/dhcp/dhcpd.conf.blank.lite new file mode 100644 index 0000000..a171e01 --- /dev/null +++ b/master/etc/dhcp/dhcpd.conf.blank.lite @@ -0,0 +1,78 @@ +# /etc/dhcp3/dhcpd.conf +# Fichier de configuration du serveur DHCP de l'ISC (package 'dhcp3-server') +# Formation Debian GNU/Linux par Alexis de Lattre +# http://formation-debian.via.ecp.fr/ + +# Consultez "man dhcpd.conf" pour avoir toutes les informations sur les options + +# DEBUT des options GLOBALES +# Les options globales s'appliqueront par defaut a tous les sous-reseaux + +# Nom de domaine +ddns-domainname "trc6500.thalesgroup.com"; +option domain-name "trc6500.thalesgroup.com"; + +# Duree du bail en secondes +default-lease-time 6000; +max-lease-time 6000; +server-name "maitre"; + +# FIN des options GLOBALES + +# DEBUT de la declaration des sous-reseaux et des machines + +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; + use-host-decl-names on; + authoritative; +} + +# liste des lames a completer dans l'ordre de la baie + +#lame fusion, pistage, LSU +host trc02 { hardware ethernet 00:00:00:00:00:02; fixed-address 10.133.26.162;} +host trc03 { hardware ethernet 00:00:00:00:00:03; fixed-address 10.133.26.163;} + +#lames gonio +host trc04 { hardware ethernet 00:00:00:00:00:04; fixed-address 10.133.26.164;} +host trc05 { hardware ethernet 00:00:00:00:00:05; fixed-address 10.133.26.165;} +host trc06 { hardware ethernet 00:00:00:00:00:06; fixed-address 10.133.26.166;} +host trc07 { hardware ethernet 00:00:00:00:00:07; fixed-address 10.133.26.167;} +host trc08 { hardware ethernet 00:00:00:00:00:08; fixed-address 10.133.26.168;} +host trc09 { hardware ethernet 00:00:00:00:00:09; fixed-address 10.133.26.169;} +host trc10 { hardware ethernet 00:00:00:00:00:0A; fixed-address 10.133.26.170;} +host trc11 { hardware ethernet 00:00:00:00:00:0B; fixed-address 10.133.26.171;} +host trc12 { hardware ethernet 00:00:00:00:00:0C; fixed-address 10.133.26.172;} +host trc13 { hardware ethernet 00:00:00:00:00:0D; fixed-address 10.133.26.173;} +host trc14 { hardware ethernet 00:00:00:00:00:0E; fixed-address 10.133.26.174;} +host trc15 { hardware ethernet 00:00:00:00:00:0F; fixed-address 10.133.26.175;} +host trc16 { hardware ethernet 00:00:00:00:00:10; fixed-address 10.133.26.176;} +host trc17 { hardware ethernet 00:00:00:00:00:11; fixed-address 10.133.26.177;} +host trc18 { hardware ethernet 00:00:00:00:00:12; fixed-address 10.133.26.178;} +host trc19 { hardware ethernet 00:00:00:00:00:13; fixed-address 10.133.26.179;} +host trc20 { hardware ethernet 00:00:00:00:00:14; fixed-address 10.133.26.180;} +host trc21 { hardware ethernet 00:00:00:00:00:15; fixed-address 10.133.26.181;} +host trc22 { hardware ethernet 00:00:00:00:00:16; fixed-address 10.133.26.182;} +host trc23 { hardware ethernet 00:00:00:00:00:17; fixed-address 10.133.26.183;} +host trc24 { hardware ethernet 00:00:00:00:00:18; fixed-address 10.133.26.184;} +host trc25 { hardware ethernet 00:00:00:00:00:19; fixed-address 10.133.26.185;} +host trc26 { hardware ethernet 00:00:00:00:00:1A; fixed-address 10.133.26.186;} +host trc27 { hardware ethernet 00:00:00:00:00:1B; fixed-address 10.133.26.187;} +host trc28 { hardware ethernet 00:00:00:00:00:1C; fixed-address 10.133.26.188;} +host trc29 { hardware ethernet 00:00:00:00:00:1D; fixed-address 10.133.26.189;} +host trc30 { hardware ethernet 00:00:00:00:00:1E; fixed-address 10.133.26.190;} +host trc31 { hardware ethernet 00:00:00:00:00:1F; fixed-address 10.133.26.191;} +host trc32 { hardware ethernet 00:00:00:00:00:20; fixed-address 10.133.26.192;} +host trc33 { hardware ethernet 00:00:00:00:00:21; fixed-address 10.133.26.193;} +host trc34 { hardware ethernet 00:00:00:00:00:22; fixed-address 10.133.26.194;} +host trc35 { hardware ethernet 00:00:00:00:00:23; fixed-address 10.133.26.195;} + +#lames monitoring +host trc36 { hardware ethernet 00:00:00:00:00:24; fixed-address 10.133.26.196;} +host trc37 { hardware ethernet 00:00:00:00:00:25; fixed-address 10.133.26.197;} +host trc38 { hardware ethernet 00:00:00:00:00:26; fixed-address 10.133.26.198;} +host trc39 { hardware ethernet 00:00:00:00:00:27; fixed-address 10.133.26.199;} + diff --git a/master/etc/dhcp/dhcpd.conf.cl0 b/master/etc/dhcp/dhcpd.conf.cl0 index 2e3f910..35ee1e2 100644 --- 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 "master"; +server-name "maitre"; # FIN des options GLOBALES @@ -46,47 +46,95 @@ 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;} +host trc01-rf { 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: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;} +host trc02-rf { hardware ethernet 00:25:90:4F:1E:8C; fixed-address 10.133.26.162;} +host trc03-rf { hardware ethernet 00:25:90:4F:23:9E; fixed-address 10.133.26.163;} +host trc04-rf { hardware ethernet 00:25:90:4F:23:A4; fixed-address 10.133.26.164;} +host trc05-rf { hardware ethernet 00:25:90:4F:18:62; fixed-address 10.133.26.165;} +host trc06-rf { hardware ethernet 00:25:90:4F:18:58; fixed-address 10.133.26.166;} +host trc07-rf { hardware ethernet 00:25:90:4F:1A:28; fixed-address 10.133.26.167;} +host trc08-rf { hardware ethernet 00:25:90:4F:BB:72; fixed-address 10.133.26.168;} +host trc09-rf { hardware ethernet 00:25:90:4F:BB:22; fixed-address 10.133.26.169;} +host trc10-rf { hardware ethernet 00:25:90:4F:BA:F2; fixed-address 10.133.26.170;} +host trc11-rf { hardware ethernet 00:25:90:4F:BA:F0; fixed-address 10.133.26.171;} +host trc12-rf { hardware ethernet 00:25:90:4f:bb:1e; fixed-address 10.133.26.172;} +host trc13-rf { hardware ethernet 00:25:90:4F:23:D4; fixed-address 10.133.26.173;} +host trc14-rf { hardware ethernet 00:25:90:4F:23:Dc; fixed-address 10.133.26.174;} +host trc15-rf { hardware ethernet 00:25:90:4F:BB:20; fixed-address 10.133.26.175;} +host trc16-rf { hardware ethernet 00:25:90:4F:E1:66; fixed-address 10.133.26.176;} +host trc17-rf { hardware ethernet 00:25:90:4F:EA:20; fixed-address 10.133.26.177;} +host trc18-rf { hardware ethernet 00:25:90:4F:E2:D2; fixed-address 10.133.26.178;} +host trc19-rf { hardware ethernet 00:25:90:4F:EF:00; fixed-address 10.133.26.179;} +host trc20-rf { hardware ethernet 00:25:90:4F:E8:0A; fixed-address 10.133.26.180;} +host trc21-rf { hardware ethernet 00:25:90:4F:C3:3C; fixed-address 10.133.26.181;} +host trc22-rf { hardware ethernet 00:25:90:4F:BB:68; fixed-address 10.133.26.182;} +host trc23-rf { hardware ethernet 00:25:90:4F:E1:62; fixed-address 10.133.26.183;} +host trc24-rf { hardware ethernet 00:25:90:4F:e4:86; fixed-address 10.133.26.184;} +host trc25-rf { hardware ethernet 00:25:90:4F:bb:74; fixed-address 10.133.26.185;} #lames monitoring -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;} +host trc26-rf { hardware ethernet 00:25:90:4F:BB:6E; fixed-address 10.133.26.186;} +host trc27-rf { hardware ethernet 00:25:90:4F:BB:66; fixed-address 10.133.26.187;} + +host trc28-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.188;} +host trc29-rf { hardware ethernet 00:00:00:00:00:02; fixed-address 10.133.26.189;} +host trc30-rf { hardware ethernet 00:00:00:00:00:03; fixed-address 10.133.26.190;} +host trc31-rf { hardware ethernet 00:25:90:88:E3:C2; fixed-address 10.133.26.191;} + +subnet 10.133.28.0 netmask 255.255.255.0 +{ + next-server 10.133.28.160; + filename "pxelinux.0"; + option routers 10.133.28.231; + option domain-name-servers 10.133.28.160; + use-host-decl-names on; + authoritative; +} + +#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;} diff --git a/master/etc/dhcp/dhcpd.conf.cl0.lite b/master/etc/dhcp/dhcpd.conf.cl0.lite new file mode 100644 index 0000000..6c90903 --- /dev/null +++ b/master/etc/dhcp/dhcpd.conf.cl0.lite @@ -0,0 +1,95 @@ +# /etc/dhcp3/dhcpd.conf +# Fichier de configuration du serveur DHCP de l'ISC (package 'dhcp3-server') +# Formation Debian GNU/Linux par Alexis de Lattre +# http://formation-debian.via.ecp.fr/ + +# Consultez "man dhcpd.conf" pour avoir toutes les informations sur les options + + +# ============================================================================ +# V1.5 +# Copyright (C) THALES. All rights reserved +# Author: Jean-Noel Raguenes +# Date : 07/12/2009 +# Modification: +# - V1.1: Herve Petit 10/03/2010 +# Reprise avec ajouts des sub net eth1 +# - V1.2: Herve Petit 24/06/2010 +# Ajout option routers sur sub net eth1 +# - V1.3: Herve Petit 25/08/2010 +# Remplacement lame trc13 par lame trc27 a cause pb d'init_statique +# qui prennait 2 mn sur cette lame +# - V1.4: Herve Petit 18/04/2011 +# Suppression definition de la route par defaut a partir du fichier dhcp +# - V1.5: Laurent Mazet 09/05/2014 +# Netoyage +# ============================================================================ + +# DEBUT des options GLOBALES +# Les options globales s'appliqueront par defaut a tous les sous-reseaux + +# Nom de domaine +ddns-domainname "trc6500.thalesgroup.com"; +option domain-name "trc6500.thalesgroup.com"; + +# Duree du bail en secondes +default-lease-time 6000; +max-lease-time 6000; +server-name "master"; + +# FIN des options GLOBALES + +# DEBUT de la declaration des sous-reseaux et des machines + +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; + use-host-decl-names on; + authoritative; +} + +#lame fusion, pistage, LSU +host trc02 { hardware ethernet 00:25:90:8A:B2:08; fixed-address 10.133.26.162;} +host trc03 { hardware ethernet 00:25:90:8A:B2:09; fixed-address 10.133.26.163;} + +#lames gonio +host trc04 { hardware ethernet 00:25:90:4F:1E:8C; fixed-address 10.133.26.164;} +host trc05 { hardware ethernet 00:25:90:4F:1E:8D; fixed-address 10.133.26.165;} +host trc06 { hardware ethernet 00:25:90:4F:23:9E; fixed-address 10.133.26.166;} +host trc07 { hardware ethernet 00:25:90:4F:23:9F; fixed-address 10.133.26.167;} +host trc08 { hardware ethernet 00:25:90:4F:23:A4; fixed-address 10.133.26.168;} +host trc09 { hardware ethernet 00:25:90:4F:23:A5; fixed-address 10.133.26.169;} +host trc10 { hardware ethernet 00:25:90:4F:18:62; fixed-address 10.133.26.170;} +host trc11 { hardware ethernet 00:25:90:4F:18:63; fixed-address 10.133.26.171;} +host trc12 { hardware ethernet 00:25:90:4F:18:58; fixed-address 10.133.26.172;} +host trc13 { hardware ethernet 00:25:90:4F:18:59; fixed-address 10.133.26.173;} +host trc14 { hardware ethernet 00:25:90:4F:1A:28; fixed-address 10.133.26.174;} +host trc15 { hardware ethernet 00:25:90:4F:1A:29; fixed-address 10.133.26.175;} +host trc16 { hardware ethernet 00:25:90:4F:BB:72; fixed-address 10.133.26.176;} +host trc17 { hardware ethernet 00:25:90:4F:BB:73; fixed-address 10.133.26.177;} +host trc18 { hardware ethernet 00:25:90:4F:BB:22; fixed-address 10.133.26.178;} +host trc19 { hardware ethernet 00:25:90:4F:BB:23; fixed-address 10.133.26.179;} +host trc20 { hardware ethernet 00:25:90:4F:BA:F2; fixed-address 10.133.26.180;} +host trc21 { hardware ethernet 00:25:90:4F:BA:F3; fixed-address 10.133.26.181;} +host trc22 { hardware ethernet 00:25:90:4F:BA:F0; fixed-address 10.133.26.182;} +host trc23 { hardware ethernet 00:25:90:4F:BA:F1; fixed-address 10.133.26.183;} +host trc24 { hardware ethernet 00:25:90:4f:bb:1e; fixed-address 10.133.26.184;} +host trc25 { hardware ethernet 00:25:90:4f:bb:1f; fixed-address 10.133.26.185;} +host trc26 { hardware ethernet 00:25:90:4F:23:D4; fixed-address 10.133.26.186;} +host trc27 { hardware ethernet 00:25:90:4F:23:D5; fixed-address 10.133.26.187;} +host trc28 { hardware ethernet 00:25:90:4F:23:Dc; fixed-address 10.133.26.188;} +host trc29 { hardware ethernet 00:25:90:4F:23:DD; fixed-address 10.133.26.189;} +host trc30 { hardware ethernet 00:25:90:4F:BB:20; fixed-address 10.133.26.190;} +host trc31 { hardware ethernet 00:25:90:4F:BB:21; fixed-address 10.133.26.191;} +host trc32 { hardware ethernet 00:25:90:4F:E1:66; fixed-address 10.133.26.192;} +host trc33 { hardware ethernet 00:25:90:4F:E1:67; fixed-address 10.133.26.193;} +host trc34 { hardware ethernet 00:25:90:4F:EA:20; fixed-address 10.133.26.194;} +host trc35 { hardware ethernet 00:25:90:4F:EA:21; fixed-address 10.133.26.195;} + +#lames monitoring +host trc36 { hardware ethernet 00:25:90:4F:E2:D2; fixed-address 10.133.26.196;} +host trc37 { hardware ethernet 00:25:90:4F:E2:D3; fixed-address 10.133.26.197;} +host trc38 { hardware ethernet 00:25:90:4F:EF:00; fixed-address 10.133.26.198;} +host trc39 { hardware ethernet 00:25:90:4F:EF:01; fixed-address 10.133.26.199;} diff --git a/master/etc/hosts.30MHzMDF b/master/etc/hosts.30MHzMDF index 2990659..e6efa49 100644 --- a/master/etc/hosts.30MHzMDF +++ b/master/etc/hosts.30MHzMDF @@ -12,65 +12,88 @@ ff02::3 ip6-allhosts # Reseau 10.133.26.0 # =============================== -10.133.26.160 trc00 maitre sup fusion nfsserver -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.160 trc00-rf maitre-rf sup-rf fusion-rf +10.133.26.161 trc01-rf lsu-rf +10.133.26.162 trc02-rf gon00-rf +10.133.26.163 trc03-rf gon01-rf +10.133.26.164 trc04-rf gon02-rf +10.133.26.165 trc05-rf gon03-rf +10.133.26.166 trc06-rf gon04-rf +10.133.26.167 trc07-rf gon05-rf +10.133.26.168 trc08-rf gon06-rf +10.133.26.169 trc09-rf gon07-rf +10.133.26.170 trc10-rf gon08-rf +10.133.26.171 trc11-rf gon09-rf +10.133.26.172 trc12-rf gon10-rf +10.133.26.173 trc13-rf gon11-rf +10.133.26.174 trc14-rf gon12-rf +10.133.26.175 trc15-rf gon13-rf +10.133.26.176 trc16-rf gon14-rf +10.133.26.177 trc17-rf gon15-rf +10.133.26.178 trc18-rf gon16-rf +10.133.26.179 trc19-rf gon17-rf +10.133.26.180 trc20-rf gon18-rf +10.133.26.181 trc21-rf gon19-rf +10.133.26.182 trc22-rf gon20-rf +10.133.26.183 trc23-rf gon21-rf +10.133.26.184 trc24-rf gon22-rf +10.133.26.185 trc25-rf gon23-rf +10.133.26.186 trc26-rf mon00-rf +10.133.26.187 trc27-rf mon01-rf 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 +10.133.28.110 fe306-1 # prod fe306 2 120->128 -10.133.26.120 fe306-2 +10.133.28.120 fe306-2 # prod fe306 3 130->138 -10.133.26.130 fe306-3 +10.133.28.130 fe306-3 # prod fe306 4 140->148 -10.133.26.140 fe306-4 +10.133.28.140 fe306-4 # prod fe306 5 150->158 -10.133.26.150 fe306-5 +10.133.28.150 fe306-5 + +10.133.28.159 amm00 +10.133.28.158 amm01 + +10.133.28.160 trc00 maitre sup fusion nfsserver +10.133.28.161 trc01 lsu +10.133.28.162 trc02 gon00 +10.133.28.163 trc03 gon01 +10.133.28.164 trc04 gon02 +10.133.28.165 trc05 gon03 +10.133.28.166 trc06 gon04 +10.133.28.167 trc07 gon05 +10.133.28.168 trc08 gon06 +10.133.28.169 trc09 gon07 +10.133.28.170 trc10 gon08 +10.133.28.171 trc11 gon09 +10.133.28.172 trc12 gon10 +10.133.28.173 trc13 gon11 +10.133.28.174 trc14 gon12 +10.133.28.175 trc15 gon13 +10.133.28.176 trc16 gon14 +10.133.28.177 trc17 gon15 +10.133.28.178 trc18 gon16 +10.133.28.179 trc19 gon17 +10.133.28.180 trc20 gon18 +10.133.28.181 trc21 gon19 +10.133.28.182 trc22 gon20 +10.133.28.183 trc23 gon21 +10.133.28.184 trc24 gon22 +10.133.28.185 trc25 gon23 +10.133.28.186 trc26 mon00 +10.133.28.187 trc27 mon01 -10.133.26.159 amm00 -10.133.26.158 amm01 +10.133.28.231 swm -10.133.26.253 matrix -10.133.26.254 gps +10.133.28.253 matrix +10.133.28.254 gps 100.100.100.101 tmt diff --git a/master/etc/hosts.30MHzMDF.lite b/master/etc/hosts.30MHzMDF.lite new file mode 100644 index 0000000..74710f9 --- /dev/null +++ b/master/etc/hosts.30MHzMDF.lite @@ -0,0 +1,72 @@ +127.0.0.1 localhost localhost.localdomain + +# The following lines are desirable for IPv6 capable hosts +::1 ip6-localhost ip6-loopback +fe00::0 ip6-localnet +ff00::0 ip6-mcastprefix +ff02::1 ip6-allnodes +ff02::2 ip6-allrouters +ff02::3 ip6-allhosts + +10.133.26.160 trc00 master sup fusion nfsserver +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 gon16 +10.133.26.166 trc06 gon01 +10.133.26.167 trc07 gon17 +10.133.26.168 trc08 gon02 +10.133.26.169 trc09 gon18 +10.133.26.170 trc10 gon03 +10.133.26.171 trc11 gon19 +10.133.26.172 trc12 gon04 +10.133.26.173 trc13 gon20 +10.133.26.174 trc14 gon05 +10.133.26.175 trc15 gon21 +10.133.26.176 trc16 gon06 +10.133.26.177 trc17 gon22 +10.133.26.178 trc18 gon07 +10.133.26.179 trc19 gon23 +10.133.26.180 trc20 gon08 +10.133.26.181 trc21 gon24 +10.133.26.182 trc22 gon09 +10.133.26.183 trc23 gon25 +10.133.26.184 trc24 gon10 +10.133.26.185 trc25 gon26 +10.133.26.186 trc26 gon11 +10.133.26.187 trc27 gon27 +10.133.26.188 trc28 gon12 +10.133.26.189 trc29 gon28 +10.133.26.190 trc30 gon13 +10.133.26.191 trc31 gon29 +10.133.26.192 trc32 gon14 +10.133.26.193 trc33 gon30 +10.133.26.194 trc34 gon15 +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 sw1 +10.133.26.232 sw2 + +# prod fe306 1 110->118 +10.133.26.110 fe306-1 +# prod fe306 2 120->128 +10.133.26.120 fe306-2 +# prod fe306 3 130->138 +10.133.26.130 fe306-3 +# prod fe306 4 140->148 +10.133.26.140 fe306-4 +# prod fe306 5 150->158 +10.133.26.150 fe306-5 + +10.133.26.159 amm00 +10.133.26.158 amm01 + +10.133.26.253 matrix +10.133.26.254 gps + +100.100.100.101 tmt diff --git a/master/etc/webconfig/alias.csv b/master/etc/webconfig/alias.csv index c15521e..aa5c6bc 100644 --- a/master/etc/webconfig/alias.csv +++ b/master/etc/webconfig/alias.csv @@ -25,12 +25,18 @@ FE306-5-flash;/usr/share/webconfig;;Flash FE306-5;/opt/trc6500/script/flash_fe30 ;;;Matrix maintenance actions; maxtrix;/usr/share/webconfig;;Configure matrix;/opt/trc6500/script/configure_matrix ;;;Switch maintenance actions; +sw1-boot;/usr/share/webconfig;;Bootstrap switch SW1;/opt/trc6500/script/configure_switch_bootstrap sw1 +sw2-boot;/usr/share/webconfig;;Bootstrap switch SW2;/opt/trc6500/script/configure_switch_bootstrap sw2 swg1-boot;/usr/share/webconfig;;Bootstrap switch SWG1;/opt/trc6500/script/configure_switch_bootstrap swg1 swg2-boot;/usr/share/webconfig;;Bootstrap switch SWG2;/opt/trc6500/script/configure_switch_bootstrap swg2 swm-boot;/usr/share/webconfig;;Bootstrap switch SWM;/opt/trc6500/script/configure_switch_bootstrap swm +sw1;/usr/share/webconfig;;Configure switch SW1;/opt/trc6500/script/configure_switch sw1 +sw2;/usr/share/webconfig;;Configure switch SW2;/opt/trc6500/script/configure_switch sw2 swg1;/usr/share/webconfig;;Configure switch SWG1;/opt/trc6500/script/configure_switch swg1 swg2;/usr/share/webconfig;;Configure switch SWG2;/opt/trc6500/script/configure_switch swg2 swm;/usr/share/webconfig;;Configure switch SWM;/opt/trc6500/script/configure_switch swm +sw1-restart;/usr/share/webconfig;;Restart switch SW1;/opt/trc6500/script/connect_switch.tcl -c reload sw1 +sw2-restart;/usr/share/webconfig;;Restart switch SW2;/opt/trc6500/script/connect_switch.tcl -c reload sw2 swg1-restart;/usr/share/webconfig;;Restart switch SWG1;/opt/trc6500/script/connect_switch.tcl -c reload swg1 swg2-restart;/usr/share/webconfig;;Restart switch SWG2;/opt/trc6500/script/connect_switch.tcl -c reload swg2 swm-restart;/usr/share/webconfig;;Restart switch SWM;/opt/trc6500/script/connect_switch.tcl -c reload swm @@ -63,6 +69,7 @@ mediatray;/usr/share/webconfig;;Remove media-tray on HS22 chassis;/opt/trc6500/s 12mhzdf;/usr/share/webconfig;;Setup 12MHzDF mode;sudo /opt/trc6500/script/change_configuration.sh 12MHzDF 12mhzmdf;/usr/share/webconfig;;Setup 12MHzMDF mode;sudo /opt/trc6500/script/change_configuration.sh 12MHzMDF 30mhzmdf;/usr/share/webconfig;;Setup 30MHzMDF mode;sudo /opt/trc6500/script/change_configuration.sh 30MHzMDF +30mhzmdf.lite;/usr/share/webconfig;;Setup 30MHzMDF lite mode;sudo /opt/trc6500/script/change_configuration.sh 30MHzMDF.lite 30mhzmhf;/usr/share/webconfig;;Setup 30MHzMHF mode;sudo /opt/trc6500/script/change_configuration.sh 30MHzMHF hw_ibm;/usr/share/webconfig;;Setup IBM HS22 chassis mode;sudo /opt/trc6500/script/change_configuration.sh hw_ibm hw_supermicro;/usr/share/webconfig;;Setup FatTwin Supermicro chassis mode;sudo /opt/trc6500/script/change_configuration.sh hw_supermicro diff --git a/master/opt/cluster/slave/etc/network/interfaces b/master/opt/cluster/slave/etc/network/interfaces index c996051..10a14dc 100644 --- a/master/opt/cluster/slave/etc/network/interfaces +++ b/master/opt/cluster/slave/etc/network/interfaces @@ -9,25 +9,8 @@ iface lo inet loopback auto eth0 iface eth0 inet dhcp pre-up ip addr flush 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 - # FE306 authentification - 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 + pre-up ip addr flush dev eth1 diff --git a/master/opt/tftp/sw1.txt b/master/opt/tftp/sw1.txt new file mode 100644 index 0000000..9c5f7fd --- /dev/null +++ b/master/opt/tftp/sw1.txt @@ -0,0 +1,357 @@ +macro name VERSION +macro description 2.3 full-duplex +@ +! +version 12.2 +no service pad +service timestamps debug datetime msec +service timestamps log datetime msec +service password-encryption +service compress-config +service sequence-numbers +! +hostname SWG1 +! +boot-start-marker +boot system flash bootflash:cat4500-ipbase-mz.122-54.SG1.bin +boot system flash bootflash:cat4500e-ipbase-mz.122-54.SG1.bin +boot-end-marker +! +enable secret 5 $1$OMTZ$xM5SrEPag4m7MGrV1u86/0 +! +! +no aaa new-model +ip subnet-zero +no ip domain-lookup +! +! +ip vrf mgmtVrf +! +ip routing +ip multicast-routing +ip igmp snooping vlan 1 immediate-leave +vtp mode transparent +! +power redundancy-mode redundant +! +! +! +! +spanning-tree mode rapid-pvst +spanning-tree extend system-id +! +vlan internal allocation policy ascending +! +vlan 10 + name IFORMATION-SYSTEM +! +! +! +interface Port-channel1 + switchport +! +interface FastEthernet1 + ip vrf forwarding mgmtVrf + no ip address + speed auto + duplex auto +! +interface GigabitEthernet1/1 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/2 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/3 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/4 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/5 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/6 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/7 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/8 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/9 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/10 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/11 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/12 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/13 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/14 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/15 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/16 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/17 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/18 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/19 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/20 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/21 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/22 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/23 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/24 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/25 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/26 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/27 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/28 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/29 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/30 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/31 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/32 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/33 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/34 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/35 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/36 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/37 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/38 + speed auto + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/39 + speed 100 + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/40 + speed 100 + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/41 + speed 100 + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/42 + speed 100 + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/43 + speed 100 + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/44 + speed 100 + duplex full + spanning-tree portfast +! +interface GigabitEthernet1/45 + media-type rj45 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/46 + media-type rj45 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/47 + media-type rj45 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/48 + switchport access vlan 10 + switchport mode access + media-type rj45 + speed auto + duplex auto + spanning-tree portfast +! +interface TenGigabitEthernet1/49 + channel-protocol pagp + channel-group 1 mode desirable +! +interface TenGigabitEthernet1/50 + channel-protocol pagp + channel-group 1 mode desirable +! +interface TenGigabitEthernet1/51 + channel-protocol pagp + channel-group 1 mode desirable +! +interface TenGigabitEthernet1/52 + channel-protocol pagp + channel-group 1 mode desirable +! +interface Vlan1 + ip address 10.133.26.231 255.255.248.0 + ip pim dense-mode +! +interface Vlan10 + ip address 100.100.100.100 255.255.255.0 + ip pim sparse-mode +! +ip forward-protocol udp echo +ip route 0.0.0.0 0.0.0.0 100.100.100.101 +ip http server +ip pim rp-address 10.133.26.231 +! +access-list 101 permit udp host 10.133.26.160 any eq echo +! +control-plane +! +! +snmp-server community public RO +! +! +line con 0 + password 7 01070E05570E15 + logging synchronous + login + stopbits 1 +line vty 0 4 + password 7 071B294D420C0A + login +line vty 5 15 + password 7 120D0D161E0E1F + login +! +ntp clock-period 17179594 +ntp server 10.133.26.254 +ntp server 10.133.26.160 +end diff --git a/master/opt/tftp/sw2.txt b/master/opt/tftp/sw2.txt new file mode 100644 index 0000000..0e50bda --- /dev/null +++ b/master/opt/tftp/sw2.txt @@ -0,0 +1,357 @@ +macro name VERSION +macro description 2.3 full-duplex +@ +! +version 12.2 +no service pad +service timestamps debug datetime msec +service timestamps log datetime msec +service password-encryption +service compress-config +service sequence-numbers +! +hostname SWG2 +! +boot-start-marker +boot system flash bootflash:cat4500-ipbase-mz.122-54.SG1.bin +boot system flash bootflash:cat4500e-ipbase-mz.122-54.SG1.bin +boot-end-marker +! +enable secret 5 $1$OMTZ$xM5SrEPag4m7MGrV1u86/0 +! +! +no aaa new-model +ip subnet-zero +no ip domain-lookup +! +! +ip vrf mgmtVrf +! +ip routing +ip multicast-routing +ip igmp snooping vlan 1 immediate-leave +vtp mode transparent +! +power redundancy-mode redundant +! +! +! +! +spanning-tree mode rapid-pvst +spanning-tree extend system-id +! +vlan internal allocation policy ascending +! +! +! +! +! +! +interface Port-channel1 + switchport +! +interface FastEthernet1 + ip vrf forwarding mgmtVrf + no ip address + speed auto + duplex auto +! +interface GigabitEthernet1/1 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/2 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/3 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/4 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/5 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/6 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/7 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/8 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/9 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/10 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/11 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/12 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/13 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/14 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/15 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/16 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/17 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/18 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/19 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/20 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/21 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/22 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/23 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/24 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/25 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/26 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/27 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/28 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/29 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/30 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/31 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/32 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/33 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/34 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/35 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/36 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/37 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/38 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/39 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/40 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/41 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/42 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/43 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/44 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/45 + media-type rj45 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/46 + media-type rj45 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/47 + media-type rj45 + speed auto + duplex auto + spanning-tree portfast +! +interface GigabitEthernet1/48 +! +! + media-type rj45 + speed auto + duplex auto + spanning-tree portfast +! +interface TenGigabitEthernet1/49 + channel-protocol pagp + channel-group 1 mode desirable +! +interface TenGigabitEthernet1/50 + channel-protocol pagp + channel-group 1 mode desirable +! +interface TenGigabitEthernet1/51 + channel-protocol pagp + channel-group 1 mode desirable +! +interface TenGigabitEthernet1/52 + channel-protocol pagp + channel-group 1 mode desirable +! +interface Vlan1 + ip address 10.133.26.232 255.255.248.0 + ip pim dense-mode +! +! +! +! +! +! +! +ip http server +ip pim rp-address 10.133.26.232 +! +! +! +control-plane +! +! +snmp-server community public RO +! +! +line con 0 + password 7 01070E05570E15 + logging synchronous + login + stopbits 1 +line vty 0 4 + password 7 071B294D420C0A + login +line vty 5 15 + password 7 120D0D161E0E1F + login +! +ntp clock-period 17179594 +ntp server 10.133.26.254 +ntp server 10.133.26.160 +end diff --git a/master/opt/tftp/swg1.txt b/master/opt/tftp/swg1.txt index 2f63163..b8d3c32 100644 --- a/master/opt/tftp/swg1.txt +++ b/master/opt/tftp/swg1.txt @@ -1,6 +1,7 @@ -macro name VERSION -macro description 2.3 full-duplex -@ + +! +! Last configuration change at 08:13:53 UTC Wed Jun 12 2013 +! NVRAM config last updated at 08:21:36 UTC Wed Jun 12 2013 ! version 12.2 no service pad @@ -20,6 +21,10 @@ boot-end-marker enable secret 5 $1$OMTZ$xM5SrEPag4m7MGrV1u86/0 ! ! +macro name VERSION +macro description 2.3 +@ +! no aaa new-model ip subnet-zero no ip domain-lookup @@ -42,9 +47,6 @@ spanning-tree extend system-id ! vlan internal allocation policy ascending ! -vlan 10 - name IFORMATION-SYSTEM -! ! ! interface Port-channel1 @@ -58,222 +60,222 @@ interface FastEthernet1 ! interface GigabitEthernet1/1 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/2 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/3 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/4 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/5 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/6 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/7 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/8 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/9 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/10 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/11 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/12 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/13 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/14 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/15 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/16 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/17 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/18 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/19 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/20 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/21 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/22 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/23 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/24 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/25 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/26 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/27 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/28 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/29 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/30 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/31 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/32 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/33 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/34 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/35 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/36 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/37 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/38 speed auto - duplex full + duplex auto spanning-tree portfast ! interface GigabitEthernet1/39 - speed 100 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/40 - speed 100 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/41 - speed 100 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/42 - speed 100 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/43 - speed 100 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/44 - speed 100 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/45 @@ -295,8 +297,6 @@ interface GigabitEthernet1/47 spanning-tree portfast ! interface GigabitEthernet1/48 - switchport access vlan 10 - switchport mode access media-type rj45 speed auto duplex auto @@ -315,30 +315,18 @@ interface TenGigabitEthernet1/51 channel-group 1 mode desirable ! interface TenGigabitEthernet1/52 - channel-protocol pagp - channel-group 1 mode desirable ! interface Vlan1 ip address 10.133.26.231 255.255.255.0 ip pim dense-mode ! -interface Vlan10 - ip address 100.100.100.100 255.255.255.0 - ip pim sparse-mode -! -ip forward-protocol udp echo -ip route 0.0.0.0 0.0.0.0 100.100.100.101 ip http server ip pim rp-address 10.133.26.231 ! -access-list 101 permit udp host 10.133.26.160 any eq echo ! control-plane ! ! -snmp-server community public RO -! -! line con 0 password 7 01070E05570E15 logging synchronous @@ -351,7 +339,8 @@ line vty 5 15 password 7 120D0D161E0E1F login ! -ntp clock-period 17179594 -ntp server 10.133.26.254 +ntp clock-period 17179537 ntp server 10.133.26.160 +ntp server 10.133.28.160 +ntp server 10.133.28.254 end diff --git a/master/opt/tftp/swg2.txt b/master/opt/tftp/swg2.txt index 1f0d9e0..7dc952d 100644 --- a/master/opt/tftp/swg2.txt +++ b/master/opt/tftp/swg2.txt @@ -1,6 +1,7 @@ -macro name VERSION -macro description 2.3 full-duplex -@ + +! +! Last configuration change at 08:13:53 UTC Wed Jun 12 2013 +! NVRAM config last updated at 08:21:36 UTC Wed Jun 12 2013 ! version 12.2 no service pad @@ -20,6 +21,10 @@ boot-end-marker enable secret 5 $1$OMTZ$xM5SrEPag4m7MGrV1u86/0 ! ! +macro name VERSION +macro description 2.3 +@ +! no aaa new-model ip subnet-zero no ip domain-lookup @@ -44,9 +49,6 @@ vlan internal allocation policy ascending ! ! ! -! -! -! interface Port-channel1 switchport ! @@ -295,8 +297,6 @@ interface GigabitEthernet1/47 spanning-tree portfast ! interface GigabitEthernet1/48 -! -! media-type rj45 speed auto duplex auto @@ -315,30 +315,18 @@ interface TenGigabitEthernet1/51 channel-group 1 mode desirable ! interface TenGigabitEthernet1/52 - channel-protocol pagp - channel-group 1 mode desirable ! interface Vlan1 ip address 10.133.26.232 255.255.255.0 ip pim dense-mode ! -! -! -! -! -! -! ip http server ip pim rp-address 10.133.26.232 ! ! -! control-plane ! ! -snmp-server community public RO -! -! line con 0 password 7 01070E05570E15 logging synchronous @@ -351,7 +339,8 @@ line vty 5 15 password 7 120D0D161E0E1F login ! -ntp clock-period 17179594 -ntp server 10.133.26.254 +ntp clock-period 17179537 ntp server 10.133.26.160 +ntp server 10.133.28.160 +ntp server 10.133.28.254 end diff --git a/master/opt/tftp/swm.txt b/master/opt/tftp/swm.txt index e164445..c635690 100644 --- a/master/opt/tftp/swm.txt +++ b/master/opt/tftp/swm.txt @@ -1,6 +1,7 @@ -macro name VERSION -macro description 2.3 -@ + +! +! Last configuration change at 12:23:15 UTC Mon Sep 1 2014 +! NVRAM config last updated at 17:38:50 UTC Fri Jul 11 2014 ! version 12.2 no service pad @@ -20,6 +21,10 @@ boot-end-marker enable secret 5 $1$OMTZ$xM5SrEPag4m7MGrV1u86/0 ! ! +macro name VERSION +macro description 2.3 +@ +! no aaa new-model ip subnet-zero no ip domain-lookup diff --git a/master/root/bin/conf_swm_integration.tcl b/master/root/bin/conf_switch_integration.tcl similarity index 97% rename from master/root/bin/conf_swm_integration.tcl rename to master/root/bin/conf_switch_integration.tcl index 8230cf9..b454138 100755 --- a/master/root/bin/conf_swm_integration.tcl +++ b/master/root/bin/conf_switch_integration.tcl @@ -2,7 +2,7 @@ set sub [lrange $argv 0 0] if { $sub == "" } { set sub "1" } -spawn telnet swg +spawn telnet sw1 expect { "Password:" { send "thales\r" } @@ -18,7 +18,7 @@ expect -exact "#" { send "config terminal\r" } expect -exact "#" { send "vlan 192\r" } expect -exact "#" { send "name Integration\r" } expect -exact "#" { send "exit\r" } - +f expect -exact "#" { send "interface gigabitEthernet 1/47\r" } expect -exact "#" { send "switchport mode access\r" } expect -exact "#" { send "switchport access vlan 192\r" } @@ -31,7 +31,7 @@ expect -exact "#" { send "no shutdown\r" } expect -exact "#" { send "exit\r" } expect -exact "#" { send "ip route 192.168.$sub.0 255.255.255.0 Vlan192\r" } -expect -exact "#" { send "ip route 192.168.$sub.160 255.255.255.255 10.133.28.160\r" } +expect -exact "#" { send "ip route 192.168.$sub.160 255.255.255.255 10.133.26.160\r" } expect -exact "#" { send "ip route 192.168.$sub.101 255.255.255.255 Vlan10\r" } expect -exact "#" { send "ip route 192.168.0.0 255.255.255.0 192.168.$sub.230\r" } expect -exact "#" { send "exit\r" } diff --git a/master/root/bin/deploiement_conf_reseau_integration.sh b/master/root/bin/deploiement_conf_reseau_integration.sh index dbdb5e2..c0bcfd1 100755 --- a/master/root/bin/deploiement_conf_reseau_integration.sh +++ b/master/root/bin/deploiement_conf_reseau_integration.sh @@ -52,7 +52,7 @@ if [ $SWITCH -eq 1 ]; then mydir=$(dirname $0) [ "$mydir" ] || mydir=. [[ "$mydir" =~ ^/ ]] || mydir=$(cd $mydir; pwd) - $mydir/conf_swm_integration.tcl $SUB + $mydir/conf_switch_integration.tcl $SUB fi # Ajout des depots debian diff --git a/simple-cdd/additional_scripts/change_configuration.sh b/simple-cdd/additional_scripts/change_configuration.sh index 918b64e..ced796b 100755 --- a/simple-cdd/additional_scripts/change_configuration.sh +++ b/simple-cdd/additional_scripts/change_configuration.sh @@ -60,7 +60,7 @@ function check () { while [ $# -gt 0 ]; do case "$1" in -h) usage 0;; - 8mhz|8MHz|12mhzdf|12MHzDF|12mhzmdf|12MHzMDF|30mhz|30MHz) MODE_BW="${1^^}";; + 8mhz|8MHz|12mhzdf|12MHzDF|12mhzmdf|12MHzMDF|30mhzmdf|30MHzMDF|30mhzmdf.lite|30MHzMDF.lite|30mhzmhf|30MHzMHF) MODE_BW="${1^^}";; fix_ssh) MODE_FIX="$1";; hw_ibm|hw_supermicro) MODE_HW="$1";; network) MODE_NET="$1";; @@ -76,18 +76,19 @@ action="" if [ "$MODE_BW" ]; then title "updating /etc/hosts" + MODE_BW=${MODE_BW/MHZ/MHz} check rm -f /etc/hosts - check ln -s /etc/hosts.${MODE_BW/MHZ/MHz} /etc/hosts + check ln -s /etc/hosts.${MODE_BW/LITE/lite} /etc/hosts TARBALLS+=" root" for ip in 0A851{A,C}; do check ln -T -f -s default /opt/tftp/pxelinux.cfg/$ip; done case "$MODE_BW" in 8MHzMHF) - #for ip in 0A851{A,C}A{1..2}; do check ln -T -f -s acq /opt/tftp/pxelinux.cfg/$ip; done for ip in 0A851{A,C}A5; do check ln -T -f -s rec /opt/tftp/pxelinux.cfg/$ip; done ;; 12MHzDF) ;; 12MHzMDF) ;; 30MHzMDF) ;; + 30MHzMDF.lite) ;; 30MHzMHF) for ip in 0A851{A,C}A{1..6}; do check ln -T -f -s acq /opt/tftp/pxelinux.cfg/$ip; done for ip in 0A851{A,C}A9; do check ln -T -f -s rec /opt/tftp/pxelinux.cfg/$ip; done diff --git a/simple-cdd/additional_scripts/configure_switch.tcl b/simple-cdd/additional_scripts/configure_switch.tcl index 7782906..4d34d43 100755 --- a/simple-cdd/additional_scripts/configure_switch.tcl +++ b/simple-cdd/additional_scripts/configure_switch.tcl @@ -13,7 +13,7 @@ set host [lrange $argv 0 0] if { $host == "" } { - puts "usage: configure_switch.tcl \[swg1|swg2|swm\]" + puts "usage: configure_switch.tcl \[sw1|sw2|swg1|swg2|swm\]" exit 1 } diff --git a/simple-cdd/additional_scripts/configure_switch_bootstrap.tcl b/simple-cdd/additional_scripts/configure_switch_bootstrap.tcl index 42fb513..db95d4d 100755 --- a/simple-cdd/additional_scripts/configure_switch_bootstrap.tcl +++ b/simple-cdd/additional_scripts/configure_switch_bootstrap.tcl @@ -2,7 +2,7 @@ set host [lrange $argv 0 0] if { $host == "" } { - puts "usage: configure_switch_bootstrap.tcl \[swg1|swg2|swm\]" + puts "usage: configure_switch_bootstrap.tcl \[sw1|sw2|swg1|swg2|swm\]" exit 1 } diff --git a/simple-cdd/additional_scripts/cpumon_lite b/simple-cdd/additional_scripts/cpumon_lite new file mode 100644 index 0000000..ae99371 --- /dev/null +++ b/simple-cdd/additional_scripts/cpumon_lite @@ -0,0 +1,27 @@ +#!/usr/bin/perl + +open PROC_STAT, "; +close PROC_STAT; +my @cpu_stat_t0 = grep {s/^cpu\d+\s//} (@proc_stat); +sleep 1; +open PROC_STAT, "; +close PROC_STAT; +my @cpu_stat_t1 = grep {s/^cpu\d+\s//} (@proc_stat); + +my $total = 0; +for (my $cpu_i=0; $cpu_i<(scalar @cpu_stat_t0); $cpu_i++) { + my @stat_t0 = split /\s+/, $cpu_stat_t0[$cpu_i]; + my @stat_t1 = split /\s+/, $cpu_stat_t1[$cpu_i]; + my ($t0_idle, $t1_idle) = ($stat_t0[3], $stat_t1[3]); + my ($t0_total, $t1_total) = (0, 0); + $t0_total += $_ foreach @stat_t0; + $t1_total += $_ foreach @stat_t1; + + my $load = ($t1_total - $t0_total == 0) ? 100: int((100 * (($t1_total - $t0_total) - ($t1_idle - $t0_idle))/($t1_total - $t0_total)) + 0.5); + print " +" unless ($cpu_i == 0); + printf "% 5.1f%% ", $load; + $total += $load; +} +printf " = % 6.1f%%\n", $total; diff --git a/simple-cdd/deb_build/debian/debian-changelog b/simple-cdd/deb_build/debian/debian-changelog index 72d5aea..6d0758f 100644 --- a/simple-cdd/deb_build/debian/debian-changelog +++ b/simple-cdd/deb_build/debian/debian-changelog @@ -1,3 +1,9 @@ +trc6500-master-files (7.8.2-1) unstable; urgency=low + + * Keep standard 30MHzDF and adds the lite configuration + + -- Thomas Pérennou Mon, 22 Jun 2015 15:15:16 +0200 + trc6500-master-files (7.8.1-1) unstable; urgency=low * .deb packaging diff --git a/simple-cdd/profiles/trc6500.preseed b/simple-cdd/profiles/trc6500.preseed index 7e06ae2..538d9b5 100644 --- a/simple-cdd/profiles/trc6500.preseed +++ b/simple-cdd/profiles/trc6500.preseed @@ -18,9 +18,9 @@ d-i netcfg/get_hostname string trc00 d-i netcfg/get_domain string thalesgroup.com # it seems domain preseeding does not work (there are bug reports on the internet..). In theory we're not using it though. d-i netcfg/get_nameservers string -d-i netcfg/get_ipaddress string 10.133.28.160 +d-i netcfg/get_ipaddress string 10.133.26.160 d-i netcfg/get_netmask string 255.255.255.0 -d-i netcfg/get_gateway string 10.133.28.231 +d-i netcfg/get_gateway string 10.133.26.231 # no DNS server # Important note : most if not all of the net config will get replaced anyway as we unpack /master into the drive. -- 2.30.2