From b00933c588755b958c8d3de2b5f5f2feeaf4c900 Mon Sep 17 00:00:00 2001 From: Laurent Mazet Date: Thu, 13 Nov 2014 19:11:18 +0100 Subject: [PATCH 01/16] Set auto-neg for all ports on SWG* switches --- master/opt/tftp/swg1.txt | 192 +++++++++++++++++++-------------------- master/opt/tftp/swg2.txt | 192 +++++++++++++++++++-------------------- 2 files changed, 192 insertions(+), 192 deletions(-) diff --git a/master/opt/tftp/swg1.txt b/master/opt/tftp/swg1.txt index c08a719..5c87a8a 100644 --- a/master/opt/tftp/swg1.txt +++ b/master/opt/tftp/swg1.txt @@ -56,247 +56,247 @@ interface FastEthernet1 duplex auto ! interface GigabitEthernet1/1 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/2 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/3 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/4 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/5 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/6 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/7 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/8 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/9 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/10 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/11 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/12 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/13 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/14 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/15 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/16 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/17 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/18 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/19 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/20 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/21 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/22 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/23 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/24 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/25 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/26 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/27 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/28 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/29 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/30 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/31 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/32 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/33 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/34 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/35 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/36 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/37 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/38 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/39 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/40 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/41 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/42 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/43 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/44 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/45 media-type rj45 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/46 media-type rj45 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/47 media-type rj45 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/48 media-type rj45 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface TenGigabitEthernet1/49 diff --git a/master/opt/tftp/swg2.txt b/master/opt/tftp/swg2.txt index 64dfb37..ad109af 100644 --- a/master/opt/tftp/swg2.txt +++ b/master/opt/tftp/swg2.txt @@ -56,247 +56,247 @@ interface FastEthernet1 duplex auto ! interface GigabitEthernet1/1 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/2 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/3 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/4 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/5 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/6 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/7 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/8 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/9 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/10 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/11 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/12 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/13 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/14 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/15 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/16 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/17 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/18 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/19 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/20 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/21 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/22 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/23 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/24 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/25 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/26 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/27 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/28 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/29 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/30 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/31 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/32 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/33 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/34 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/35 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/36 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/37 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/38 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/39 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/40 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/41 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/42 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/43 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/44 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/45 media-type rj45 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/46 media-type rj45 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/47 media-type rj45 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface GigabitEthernet1/48 media-type rj45 - speed 1000 - duplex full + speed auto + duplex auto spanning-tree portfast ! interface TenGigabitEthernet1/49 -- 2.30.2 From 014e866d808b3ba323a9103b237e5474e1db2baa Mon Sep 17 00:00:00 2001 From: Laurent Mazet Date: Thu, 13 Nov 2014 19:17:16 +0100 Subject: [PATCH 02/16] Add OS version --- master/opt/cluster/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/master/opt/cluster/Makefile b/master/opt/cluster/Makefile index bf3621d..d18285f 100644 --- a/master/opt/cluster/Makefile +++ b/master/opt/cluster/Makefile @@ -41,3 +41,4 @@ clean: chmod ug+rw,o+r,o-w,a-x /var/log/wtmp /var/log/lastlog chown root:utmp /var/log/btmp /var/log/wtmp /var/log/lastlog find / -name trc6500_list_patched_files.txt -exec rm -f {} \; + echo date +%Y%m%d > /etc/trc6500_os_version -- 2.30.2 From baa143ebf6783f4c5d813beaefd72befe4b95fbc Mon Sep 17 00:00:00 2001 From: Laurent Mazet Date: Thu, 13 Nov 2014 20:02:14 +0100 Subject: [PATCH 03/16] add link for rec and slave --- rec | 1 + slave | 1 + 2 files changed, 2 insertions(+) create mode 120000 rec create mode 120000 slave diff --git a/rec b/rec new file mode 120000 index 0000000..82877bd --- /dev/null +++ b/rec @@ -0,0 +1 @@ +master/opt/cluster/rec \ No newline at end of file diff --git a/slave b/slave new file mode 120000 index 0000000..9b3f469 --- /dev/null +++ b/slave @@ -0,0 +1 @@ +master/opt/cluster/slave \ No newline at end of file -- 2.30.2 From 4aba78da3d59d7f35ff10c799ab7d15b3ceba902 Mon Sep 17 00:00:00 2001 From: Laurent Mazet Date: Fri, 28 Nov 2014 17:56:51 +0100 Subject: [PATCH 04/16] add some scripts --- master/root/bin/cpumon_lite | 20 ++++++++++ master/root/bin/monitor_cmd | 70 ++++++++++++++++++++++++++++++++ master/root/bin/monitor_proc | 77 ++++++++++++++++++++++++++++++++++++ 3 files changed, 167 insertions(+) create mode 100755 master/root/bin/cpumon_lite create mode 100755 master/root/bin/monitor_cmd create mode 100755 master/root/bin/monitor_proc diff --git a/master/root/bin/cpumon_lite b/master/root/bin/cpumon_lite new file mode 100755 index 0000000..d9919a4 --- /dev/null +++ b/master/root/bin/cpumon_lite @@ -0,0 +1,20 @@ +#!/bin/sh + +INSTALL_DIR=$(dirname $0) + +$INSTALL_DIR/monitor_proc -s /proc/stat +while true; do + sleep 1 + $INSTALL_DIR/monitor_proc /proc/stat | \ + awk ' +BEGIN { printf "cpu:" } +/cpu[0-9]/ { + idle=$5 + sum=0; for (i=2;i<=NF;i++) sum+=$(i) + load=(sum-idle)*100/sum + tot+=load + if (not_first) not_first=1; else printf " +" + printf " % 5.1f%%", load +} +END { printf " = % 6.1f%%\n", tot }' +done diff --git a/master/root/bin/monitor_cmd b/master/root/bin/monitor_cmd new file mode 100755 index 0000000..9681684 --- /dev/null +++ b/master/root/bin/monitor_cmd @@ -0,0 +1,70 @@ +#!/bin/bash + +# default values +PROGNAME=$(basename $0) +FULLPROG=$0 + +# usage +function usage () { + echo "usage: $PROGNAME [-h] [-r] cmd" + echo " -h: help message" + echo " -s: set stats" + echo " -r: reset stats" + echo "cmd: shell command" +} + +# reset +function reset () { + echo "reseting stats" + [ -f $resource ] && rm $resource +} + +# variables +set= +cmd= +resource=$HOME/.$PROGNAME + +# parameter processing +while [ $# -gt 0 ]; do + if [ "$cmd" ]; then + cmd="$cmd $1" + else + case "$1" in + -h) usage; exit 0;; + -s) set="yes";; + -r) reset; exit 0;; + *) cmd="$1";; + esac + fi + shift +done + +# check arguments +[ "$cmd" ] || { echo "no command specified"; exit 1; } +[ "$(which ${cmd/ *})" ] || { echo "command not found '$cmd'"; exit 1; } + +# read old values +[ -f $resource ] && source $resource + +# main +var=$(echo _$cmd | sed 's/[^A-Za-z0-9]/_/g;s/__*/_/g') +newvar=($(eval $cmd | awk '{ for (i = 1; i <= NF; i++) if ($(i) ~ /^[-+0-9][0-9]*$/) printf " %s", $(i) }')) +eval oldvar=(\${$var[@]}) + +# compute diff +for ((i=0; i<${#newvar[@]}; i++)); do + [ "${oldvar[$i]}" ] && v[$i]=$((newvar[i] - oldvar[i])) || v[$i]=${newvar[$i]} +done + +# ouput +if [ "$set" = "yes" ]; then + echo "$var=(${newvar[@]})" >>$resource + awk -F= '{ a[$1]=$2 } END { for (i in a) print i "=" a[i] }' $resource > $resource.n + mv -f $resource.n $resource +else + str="" + for ((i=0; i<${#v[@]}; i++)); do + str="$str; v[$i]=${v[$i]}" + done + eval $cmd | gawk 'BEGIN { k=0 '"$str"' } { n = 1; for (i=1; i<=NF; i++) if ($(i) ~ /^[-+0-9][0-9]*$/) { if ((i == 1) && ! ($0 ~ /^ /)) $(i) = v[k]; else $0 = gensub(/ [-+0-9][0-9]*/, " " v[k], n); k++; n++ } print }' +fi diff --git a/master/root/bin/monitor_proc b/master/root/bin/monitor_proc new file mode 100755 index 0000000..c2b1ab7 --- /dev/null +++ b/master/root/bin/monitor_proc @@ -0,0 +1,77 @@ +#!/bin/bash + +# default values +PROGNAME=$(basename $0) +FULLPROG=$0 + +# usage +function usage () { + echo "usage: $PROGNAME [-h] [-r] file" + echo " -h: help message" + echo " -s: set stats" + echo " -r: reset stats" + echo " file: data to monitor" +} + +# reset +function reset () { + echo "reseting stats" + [ -f $resource ] && rm $resource +} + +# variables +set= +files= +resource=$HOME/.$PROGNAME + +# parameter processing +while [ $# -gt 0 ]; do + case "$1" in + -h) usage; exit 0;; + -s) set="yes";; + -r) reset; exit 0;; + *) files="$files $1";; + esac + shift +done + +# check arguments +[ "$files" ] || { echo "no file specified"; exit 1; } + +# read old values +[ -f $resource ] && source $resource + +for f in $files; do + + # check file + f=$(echo $f | sed 's,//*,/,g') + [ -f $f ] || { echo "can't find file '$f'"; exit 1; } + + # main + var=${f//\//_} + newvar=($(awk '{ for (i = 1; i <= NF; i++) if ($(i) ~ /^[-+0-9][0-9]*$/) printf " %s", $(i) }' $f)) + eval oldvar=(\${$var[@]}) + + # compute diff + for ((i=0; i<${#newvar[@]}; i++)); do + [ "${oldvar[$i]}" ] && v[$i]=$((newvar[i] - oldvar[i])) || v[$i]=${newvar[$i]} + done + + # ouput + if [ "$set" = "yes" ]; then + echo "$var=(${newvar[@]})" >>$resource + else + str="" + for ((i=0; i<${#v[@]}; i++)); do + str="$str; v[$i]=${v[$i]}" + done + awk 'BEGIN { k=0 '"$str"' } { for (i=1; i<=NF; i++) if ($(i) ~ /^[-+0-9][0-9]*$/) $(i)=v[k++]; print }' $f + fi + +done + +# clean resource file +if [ "$set" = "yes" ]; then + awk -F= '{ a[$1]=$2 } END { for (i in a) print i "=" a[i] }' $resource > $resource.n + mv -f $resource.n $resource +fi \ No newline at end of file -- 2.30.2 From 0892f065a81a8168e71fae85e82550b192369a67 Mon Sep 17 00:00:00 2001 From: Laurent Mazet Date: Wed, 3 Dec 2014 12:00:30 +0100 Subject: [PATCH 05/16] remove octave and gnuplot-x11 packages --- master/root/debian-list.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/master/root/debian-list.txt b/master/root/debian-list.txt index 63c49a0..a5a1979 100644 --- a/master/root/debian-list.txt +++ b/master/root/debian-list.txt @@ -65,7 +65,7 @@ gettext-base git gnupg gnuplot -gnuplot-x11 +gnuplot-nox gpgv gpm grep @@ -203,7 +203,6 @@ net-tools netbase netcat-traditional ntpdate -octave p7zip-full par2 passwd -- 2.30.2 From 1be977463e4cc761aec9bb097dc5aebbfaeb1517 Mon Sep 17 00:00:00 2001 From: Laurent Mazet Date: Wed, 3 Dec 2014 12:16:57 +0100 Subject: [PATCH 06/16] correct ip route 0.0.0.0 0.0.0.0 100.100.100.101 --- master/opt/tftp/swm.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/master/opt/tftp/swm.txt b/master/opt/tftp/swm.txt index fb19289..c635690 100644 --- a/master/opt/tftp/swm.txt +++ b/master/opt/tftp/swm.txt @@ -22,7 +22,7 @@ enable secret 5 $1$OMTZ$xM5SrEPag4m7MGrV1u86/0 ! ! macro name VERSION -macro description 2.2 +macro description 2.3 @ ! no aaa new-model @@ -336,7 +336,7 @@ interface Vlan26 ip pim dense-mode ! ip forward-protocol udp echo -ip route 0.0.0.0 255.255.255.255 100.100.100.101 +ip route 0.0.0.0 0.0.0.0 100.100.100.101 ip http server ip pim rp-address 100.100.100.100 ! -- 2.30.2 From 15db1f56a5e1ba259d761fd16dc997f91e3f5827 Mon Sep 17 00:00:00 2001 From: Laurent Mazet Date: Wed, 3 Dec 2014 18:20:26 +0100 Subject: [PATCH 07/16] add ipmi wake service --- master/etc/init.d/ipmiwake | 69 +++++++++++++++++++ master/opt/cluster/slave/etc/default/ipmiwake | 1 + 2 files changed, 70 insertions(+) create mode 100755 master/etc/init.d/ipmiwake create mode 100644 master/opt/cluster/slave/etc/default/ipmiwake diff --git a/master/etc/init.d/ipmiwake b/master/etc/init.d/ipmiwake new file mode 100755 index 0000000..d20b9bc --- /dev/null +++ b/master/etc/init.d/ipmiwake @@ -0,0 +1,69 @@ +#!/bin/sh +VER=1.0 +# ============================================================================ +# +# Copyright (C) THALES. All rights reserved +# Author: Laurent Mazet & Thomas Perennou +# Date : 03/12/2014 +# ============================================================================ + +### BEGIN INIT INFO +# Provides: ipmiwake +# Required-Start: $network +# Required-Stop: +# Should-Start: +# Default-Start: S +# Default-Stop: +# Short-Description: IPMI wake cluster blades +# Description: Boot all cluster blades by IPMI boot command +### END INIT INFO + +DHCPCONF=/etc/dhcp/dhcpd.conf +ENABLE="yes" +TIMEOUT=10000 + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +[ -f /etc/default/ipmiwake ] && . /etc/default/ipmiwake +[ "$ENABLE" = "yes" ] || exit 0 + +. /lib/lsb/init-functions + +do_start () { + + log_action_msg "Send IPMI boot command" + + ip addr add 10.133.25.1/24 dev eth0 + + for mac in $(awk '{ sub(/#.*/, "") } /trc[0-9]/ && ! /-rf/ { gsub(/[;{}]/, " "); print $5}' $DHCPCONF); do + ipmi=$(grep $mac $DHCPCONF | sed 's/.* [0-9.]*\.\([0-9][0-9]*\)[^0-9].*/10.133.25.\1/') + host=$(awk '{sub(/#.*/, "")} /'$mac'/ {gsub(/[{}]/, " "); print $2}' $DHCPCONF) + log_action_msg "Wake-up $host (IPMI boot $ipmi)" + ipmipower --session-timeout=$TIMEOUT -h $ipmi -u ADMIN -p ADMIN --on & + done + + wait + + ip addr del 10.133.25.1/24 dev eth0 +} + +case "$1" in + -v) + echo "$(basename $0), version $VER" + ;; + start) + do_start + ;; + restart|reload|force-reload) + echo "Error: argument '$1' not supported" >&2 + exit 3 + ;; + stop) + # No-op + ;; + *) + echo "Usage: $0 start|stop" >&2 + exit 3 + ;; +esac + +# vim:set tabstop=4 expandtab shiftwidth=4: diff --git a/master/opt/cluster/slave/etc/default/ipmiwake b/master/opt/cluster/slave/etc/default/ipmiwake new file mode 100644 index 0000000..60d1c73 --- /dev/null +++ b/master/opt/cluster/slave/etc/default/ipmiwake @@ -0,0 +1 @@ +ENABLE=no -- 2.30.2 From d1be43ee76b0f50277ba1d3a76f305eb54e0449c Mon Sep 17 00:00:00 2001 From: Laurent Mazet Date: Wed, 3 Dec 2014 18:25:45 +0100 Subject: [PATCH 08/16] add wait switch service --- master/etc/init.d/waitswitches | 57 ++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100755 master/etc/init.d/waitswitches diff --git a/master/etc/init.d/waitswitches b/master/etc/init.d/waitswitches new file mode 100755 index 0000000..0a30d59 --- /dev/null +++ b/master/etc/init.d/waitswitches @@ -0,0 +1,57 @@ +#!/bin/sh +VER=1.0 +# ============================================================================ +# +# Copyright (C) THALES. All rights reserved +# Author: Thomas Perennou (Viveris Technologies) +# Date : 03/12/2014 +# ============================================================================ + +### BEGIN INIT INFO +# Provides: waitswithes +# Required-Start: $network +# Required-Stop: +# Should-Start: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: Wait switches +# Description: Wait for all switches are ready for running +### END INIT INFO + +ENABLE="yes" +SCRIPT=/opt/trc6500/script/check_switches.sh +TIMEOUT=360 + +PATH=/sbin:/usr/sbin:/bin:/usr/bin +[ -f /etc/default/waitswitches ] && . /etc/default/waitswitches +[ -x $SCRIPT ] || exit 1 +[ "$ENABLE" = "yes" ] || exit 0 + +. /lib/lsb/init-functions + +do_start () { + log_action_msg "Wait all switches" + $SCRIPT -t $TIMEOUT -w +} + +case "$1" in + -v) + echo "$(basename $0), version $VER" + ;; + start) + do_start + ;; + restart|reload|force-reload) + echo "Error: argument '$1' not supported" >&2 + exit 3 + ;; + stop) + # No-op + ;; + *) + echo "Usage: $0 start|stop" >&2 + exit 3 + ;; +esac + +# vim:set tabstop=4 expandtab shiftwidth=4: -- 2.30.2 From db52c898939ef78e4cb42638992ac54b6cf12163 Mon Sep 17 00:00:00 2001 From: Laurent Mazet Date: Wed, 3 Dec 2014 18:26:20 +0100 Subject: [PATCH 09/16] clean mac addresses for blank dhcpd.conf --- master/etc/dhcp/dhcpd.conf.blank | 122 +++++++++++++++---------------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/master/etc/dhcp/dhcpd.conf.blank b/master/etc/dhcp/dhcpd.conf.blank index e95be67..cf260ed 100644 --- a/master/etc/dhcp/dhcpd.conf.blank +++ b/master/etc/dhcp/dhcpd.conf.blank @@ -57,39 +57,39 @@ subnet 10.133.26.0 netmask 255.255.255.0 host trc01-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.161;} #lames gonio -host trc02-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.162;} -host trc03-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.163;} -host trc04-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.164;} -host trc05-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.165;} -host trc06-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.166;} -host trc07-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.167;} -host trc08-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.168;} -host trc09-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.169;} -host trc10-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.170;} -host trc11-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.171;} -host trc12-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.172;} -host trc13-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.173;} -host trc14-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.174;} -host trc15-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.175;} -host trc16-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.176;} -host trc17-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.177;} -host trc18-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.178;} -host trc19-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.179;} -host trc20-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.180;} -host trc21-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.181;} -host trc22-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.182;} -host trc23-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.183;} -host trc24-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.184;} -host trc25-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.185;} +host trc02-rf { hardware ethernet 00:00:00:00:00:02; fixed-address 10.133.26.162;} +host trc03-rf { hardware ethernet 00:00:00:00:00:03; fixed-address 10.133.26.163;} +host trc04-rf { hardware ethernet 00:00:00:00:00:04; fixed-address 10.133.26.164;} +host trc05-rf { hardware ethernet 00:00:00:00:00:05; fixed-address 10.133.26.165;} +host trc06-rf { hardware ethernet 00:00:00:00:00:06; fixed-address 10.133.26.166;} +host trc07-rf { hardware ethernet 00:00:00:00:00:07; fixed-address 10.133.26.167;} +host trc08-rf { hardware ethernet 00:00:00:00:00:08; fixed-address 10.133.26.168;} +host trc09-rf { hardware ethernet 00:00:00:00:00:09; fixed-address 10.133.26.169;} +host trc10-rf { hardware ethernet 00:00:00:00:00:0A; fixed-address 10.133.26.170;} +host trc11-rf { hardware ethernet 00:00:00:00:00:0B; fixed-address 10.133.26.171;} +host trc12-rf { hardware ethernet 00:00:00:00:00:0C; fixed-address 10.133.26.172;} +host trc13-rf { hardware ethernet 00:00:00:00:00:0D; fixed-address 10.133.26.173;} +host trc14-rf { hardware ethernet 00:00:00:00:00:0E; fixed-address 10.133.26.174;} +host trc15-rf { hardware ethernet 00:00:00:00:00:0F; fixed-address 10.133.26.175;} +host trc16-rf { hardware ethernet 00:00:00:00:00:10; fixed-address 10.133.26.176;} +host trc17-rf { hardware ethernet 00:00:00:00:00:11; fixed-address 10.133.26.177;} +host trc18-rf { hardware ethernet 00:00:00:00:00:12; fixed-address 10.133.26.178;} +host trc19-rf { hardware ethernet 00:00:00:00:00:13; fixed-address 10.133.26.179;} +host trc20-rf { hardware ethernet 00:00:00:00:00:14; fixed-address 10.133.26.180;} +host trc21-rf { hardware ethernet 00:00:00:00:00:15; fixed-address 10.133.26.181;} +host trc22-rf { hardware ethernet 00:00:00:00:00:16; fixed-address 10.133.26.182;} +host trc23-rf { hardware ethernet 00:00:00:00:00:17; fixed-address 10.133.26.183;} +host trc24-rf { hardware ethernet 00:00:00:00:00:18; fixed-address 10.133.26.184;} +host trc25-rf { hardware ethernet 00:00:00:00:00:19; fixed-address 10.133.26.185;} #lames monitoring -host trc26-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.186;} -host trc27-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.187;} +host trc26-rf { hardware ethernet 00:00:00:00:00:1A; fixed-address 10.133.26.186;} +host trc27-rf { hardware ethernet 00:00:00:00:00:1B; 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:01; fixed-address 10.133.26.189;} -host trc30-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.190;} -host trc31-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.191;} +host trc28-rf { hardware ethernet 00:00:00:00:00:1C; fixed-address 10.133.26.188;} +host trc29-rf { hardware ethernet 00:00:00:00:00:1D; fixed-address 10.133.26.189;} +host trc30-rf { hardware ethernet 00:00:00:00:00:1E; fixed-address 10.133.26.190;} +host trc31-rf { hardware ethernet 00:00:00:00:00:1F; fixed-address 10.133.26.191;} subnet 10.133.28.0 netmask 255.255.255.0 { @@ -102,39 +102,39 @@ subnet 10.133.28.0 netmask 255.255.255.0 } #lame fusion, pistage, LSU -host trc01 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.161;} +host trc01 { hardware ethernet 00:00:00:00:01:01; fixed-address 10.133.28.161;} #lames gonio -host trc02 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.162;} -host trc03 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.163;} -host trc04 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.164;} -host trc05 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.165;} -host trc06 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.166;} -host trc07 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.167;} -host trc08 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.168;} -host trc09 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.169;} -host trc10 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.170;} -host trc11 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.171;} -host trc12 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.172;} -host trc13 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.173;} -host trc14 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.174;} -host trc15 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.175;} -host trc16 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.176;} -host trc17 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.177;} -host trc18 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.178;} -host trc19 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.179;} -host trc20 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.180;} -host trc21 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.181;} -host trc22 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.182;} -host trc23 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.183;} -host trc24 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.184;} -host trc25 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.185;} +host trc02 { hardware ethernet 00:00:00:00:01:02; fixed-address 10.133.28.162;} +host trc03 { hardware ethernet 00:00:00:00:01:03; fixed-address 10.133.28.163;} +host trc04 { hardware ethernet 00:00:00:00:01:04; fixed-address 10.133.28.164;} +host trc05 { hardware ethernet 00:00:00:00:01:05; fixed-address 10.133.28.165;} +host trc06 { hardware ethernet 00:00:00:00:01:06; fixed-address 10.133.28.166;} +host trc07 { hardware ethernet 00:00:00:00:01:07; fixed-address 10.133.28.167;} +host trc08 { hardware ethernet 00:00:00:00:01:08; fixed-address 10.133.28.168;} +host trc09 { hardware ethernet 00:00:00:00:01:09; fixed-address 10.133.28.169;} +host trc10 { hardware ethernet 00:00:00:00:01:0A; fixed-address 10.133.28.170;} +host trc11 { hardware ethernet 00:00:00:00:01:0B; fixed-address 10.133.28.171;} +host trc12 { hardware ethernet 00:00:00:00:01:0C; fixed-address 10.133.28.172;} +host trc13 { hardware ethernet 00:00:00:00:01:0D; fixed-address 10.133.28.173;} +host trc14 { hardware ethernet 00:00:00:00:01:0E; fixed-address 10.133.28.174;} +host trc15 { hardware ethernet 00:00:00:00:01:0F; fixed-address 10.133.28.175;} +host trc16 { hardware ethernet 00:00:00:00:01:10; fixed-address 10.133.28.176;} +host trc17 { hardware ethernet 00:00:00:00:01:11; fixed-address 10.133.28.177;} +host trc18 { hardware ethernet 00:00:00:00:01:12; fixed-address 10.133.28.178;} +host trc19 { hardware ethernet 00:00:00:00:01:13; fixed-address 10.133.28.179;} +host trc20 { hardware ethernet 00:00:00:00:01:14; fixed-address 10.133.28.180;} +host trc21 { hardware ethernet 00:00:00:00:01:15; fixed-address 10.133.28.181;} +host trc22 { hardware ethernet 00:00:00:00:01:16; fixed-address 10.133.28.182;} +host trc23 { hardware ethernet 00:00:00:00:01:17; fixed-address 10.133.28.183;} +host trc24 { hardware ethernet 00:00:00:00:01:18; fixed-address 10.133.28.184;} +host trc25 { hardware ethernet 00:00:00:00:01:19; fixed-address 10.133.28.185;} #lames monitoring -host trc26 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.186;} -host trc27 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.187;} +host trc26 { hardware ethernet 00:00:00:00:01:1A; fixed-address 10.133.28.186;} +host trc27 { hardware ethernet 00:00:00:00:01:1B; 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:01; fixed-address 10.133.26.189;} -host trc30 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.190;} -host trc31 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.191;} +host trc28 { hardware ethernet 00:00:00:00:01:1C; fixed-address 10.133.26.188;} +host trc29 { hardware ethernet 00:00:00:00:01:1D; fixed-address 10.133.26.189;} +host trc30 { hardware ethernet 00:00:00:00:01:1E; fixed-address 10.133.26.190;} +host trc31 { hardware ethernet 00:00:00:00:01:1F; fixed-address 10.133.28.191;} -- 2.30.2 From 545c1fd0dfa3c0f2fde947aef9a317bc7b27b002 Mon Sep 17 00:00:00 2001 From: Laurent Mazet Date: Wed, 3 Dec 2014 18:26:34 +0100 Subject: [PATCH 10/16] clean code --- master/etc/init.d/etherwake | 10 ++++++---- master/etc/init.d/wakeonlan | 15 ++++++++------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/master/etc/init.d/etherwake b/master/etc/init.d/etherwake index 401992e..d23bccb 100755 --- a/master/etc/init.d/etherwake +++ b/master/etc/init.d/etherwake @@ -1,5 +1,5 @@ #!/bin/sh -VER=1.3 +VER=1.4 # ============================================================================ # # Copyright (C) THALES. All rights reserved @@ -13,6 +13,8 @@ VER=1.3 # temps entre 2 wake # - V1.3: Laurent Mazet 02/05/2013 # Daemonisation +# - V1.4: Laurent Mazet & Thomas Perennou 03/12/2014 +# Legers correctifs # ============================================================================ ### BEGIN INIT INFO @@ -45,10 +47,10 @@ do_start () { n=0 while [ $NB_TRY -gt 0 ]; do - for mac in $(awk '{sub(/#.*/, "")} /trc[0-9]/ {gsub(/;/, " "); print $6}' $DHCPCONF); do - host=$(awk '{sub(/#.*/, "")} /'$mac'/ {print $2}' $DHCPCONF) + for mac in $(awk '{sub(/#.*/, "")} /trc[0-9]/ {gsub(/[;{}]/, " "); print $5}' $DHCPCONF); do + host=$(awk '{sub(/#.*/, "")} /'$mac'/ {gsub(/[{}]/, " "); print $2}' $DHCPCONF) - log_action_msg "Wake-up $host ($mac)" + log_action_msg "Wake-up $host (EtherWake $mac)" etherwake $mac n=$(expr $n + 1) diff --git a/master/etc/init.d/wakeonlan b/master/etc/init.d/wakeonlan index 2a36ed8..1c360ce 100755 --- a/master/etc/init.d/wakeonlan +++ b/master/etc/init.d/wakeonlan @@ -1,5 +1,5 @@ #!/bin/sh -VER=1.3 +VER=1.5 # ============================================================================ # # Copyright (C) THALES. All rights reserved @@ -13,6 +13,8 @@ VER=1.3 # et de broadcast # - V1.4: Laurent Mazet 09/05/2014 # Daemonisation +# - V1.5: Laurent Mazet & Thomas Perennou 03/12/2014 +# Legers correctifs # ============================================================================ ### BEGIN INIT INFO @@ -39,12 +41,11 @@ do_start () { log_action_msg "Activate Wake On Lan" - mac=$(awk '{ sub(/#.*/, "") } /trc[0-9]/ { gsub(/;/, " "); print $6}' $DHCPCONF) - - for m in $mac; do - broadcast=$(grep $m /etc/dhcp/dhcpd.conf | sed 's/.* \([0-9.]*\)\..*/\1.255/') - log_action_msg "Wake-up $broadcast ($m)" - wakeonlan -p 7 -i $broadcast $m + for mac in $(awk '{ sub(/#.*/, "") } /trc[0-9]/ { gsub(/[;{}]/, " "); print $5}' $DHCPCONF); do + broadcast=$(grep $mac $DHCPCONF | sed 's/.* \([0-9.]*\)\..*/\1.255/') + host=$(awk '{sub(/#.*/, "")} /'$mac'/ {gsub(/[{}]/, " "); print $2}' $DHCPCONF) + log_action_msg "Wake-up $host (WOL $mac $broadcast)" + wakeonlan -p 7 -i $broadcast $mac done } -- 2.30.2 From 1716702fb7257638364ef6900707e3dce93fbc86 Mon Sep 17 00:00:00 2001 From: Laurent Mazet Date: Wed, 3 Dec 2014 18:27:01 +0100 Subject: [PATCH 11/16] update install procedure --- install_debian.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/install_debian.txt b/install_debian.txt index f941253..5be73ef 100644 --- a/install_debian.txt +++ b/install_debian.txt @@ -35,8 +35,10 @@ Step 3: rsync -va master/ root@10.133.28.160:/ * on blade update-rc.d etherwake enable + update-rc.d ipmiwake enable update-rc.d shutdownallblades enable update-rc.d wakeonlan enable update-rc.d waitslaves enable + update-rc.d waitswitches enable chown webconfig /etc/webconfig/alias.csv reboot -- 2.30.2 From e7b2a7cc67a2df9166f3293e6c8f081676dfecb6 Mon Sep 17 00:00:00 2001 From: Laurent Mazet Date: Wed, 3 Dec 2014 19:19:01 +0100 Subject: [PATCH 12/16] update ipmi settings --- master/opt/ipmi/ipmicfg.sh | 3 ++- master/opt/ipmi/update_blade_cfg.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/master/opt/ipmi/ipmicfg.sh b/master/opt/ipmi/ipmicfg.sh index cf65535..db30fd2 100755 --- a/master/opt/ipmi/ipmicfg.sh +++ b/master/opt/ipmi/ipmicfg.sh @@ -8,5 +8,6 @@ trap "cd $pwd; exit 1;" 2 3 15 cd $mydir ./$(basename ${0%.sh}) $@ +rc=$? cd $pwd -exit 0 +exit $? diff --git a/master/opt/ipmi/update_blade_cfg.sh b/master/opt/ipmi/update_blade_cfg.sh index 9e89959..1a5663f 100755 --- a/master/opt/ipmi/update_blade_cfg.sh +++ b/master/opt/ipmi/update_blade_cfg.sh @@ -63,5 +63,6 @@ do_cmd $mydir/ipmicfg.sh -m 10.133.25.$ID do_cmd $mydir/ipmicfg.sh -k 255.255.255.0 #do_cmd $mydir/ipmicfg.sh -g 10.133.26.231 do_cmd $mydir/ipmicfg.sh -g 0.0.0.0 -do_cmd $mydir/ipmicfg.sh -fan 3 +fanmode=$($mydir/ipmicfg.sh -fan 2>/dev/null | awk -F: '$2 ~ /Optimal/ {print $1}') +[ "$fanmode" ] && do_cmd $mydir/ipmicfg.sh -fan $fanmode [ "$(which ipmitool)" ] && do_cmd ipmitool chassis policy always-on -- 2.30.2 From 5565bfba6736b71e7db4e9670a495f1001d91d1c Mon Sep 17 00:00:00 2001 From: Laurent Mazet Date: Thu, 4 Dec 2014 12:09:52 +0100 Subject: [PATCH 13/16] defaut dhcpd.conf is blank --- master/etc/dhcp/dhcpd.conf | 122 ++++++++++++++++++------------------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/master/etc/dhcp/dhcpd.conf b/master/etc/dhcp/dhcpd.conf index e95be67..cf260ed 100644 --- a/master/etc/dhcp/dhcpd.conf +++ b/master/etc/dhcp/dhcpd.conf @@ -57,39 +57,39 @@ subnet 10.133.26.0 netmask 255.255.255.0 host trc01-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.161;} #lames gonio -host trc02-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.162;} -host trc03-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.163;} -host trc04-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.164;} -host trc05-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.165;} -host trc06-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.166;} -host trc07-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.167;} -host trc08-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.168;} -host trc09-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.169;} -host trc10-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.170;} -host trc11-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.171;} -host trc12-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.172;} -host trc13-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.173;} -host trc14-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.174;} -host trc15-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.175;} -host trc16-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.176;} -host trc17-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.177;} -host trc18-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.178;} -host trc19-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.179;} -host trc20-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.180;} -host trc21-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.181;} -host trc22-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.182;} -host trc23-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.183;} -host trc24-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.184;} -host trc25-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.185;} +host trc02-rf { hardware ethernet 00:00:00:00:00:02; fixed-address 10.133.26.162;} +host trc03-rf { hardware ethernet 00:00:00:00:00:03; fixed-address 10.133.26.163;} +host trc04-rf { hardware ethernet 00:00:00:00:00:04; fixed-address 10.133.26.164;} +host trc05-rf { hardware ethernet 00:00:00:00:00:05; fixed-address 10.133.26.165;} +host trc06-rf { hardware ethernet 00:00:00:00:00:06; fixed-address 10.133.26.166;} +host trc07-rf { hardware ethernet 00:00:00:00:00:07; fixed-address 10.133.26.167;} +host trc08-rf { hardware ethernet 00:00:00:00:00:08; fixed-address 10.133.26.168;} +host trc09-rf { hardware ethernet 00:00:00:00:00:09; fixed-address 10.133.26.169;} +host trc10-rf { hardware ethernet 00:00:00:00:00:0A; fixed-address 10.133.26.170;} +host trc11-rf { hardware ethernet 00:00:00:00:00:0B; fixed-address 10.133.26.171;} +host trc12-rf { hardware ethernet 00:00:00:00:00:0C; fixed-address 10.133.26.172;} +host trc13-rf { hardware ethernet 00:00:00:00:00:0D; fixed-address 10.133.26.173;} +host trc14-rf { hardware ethernet 00:00:00:00:00:0E; fixed-address 10.133.26.174;} +host trc15-rf { hardware ethernet 00:00:00:00:00:0F; fixed-address 10.133.26.175;} +host trc16-rf { hardware ethernet 00:00:00:00:00:10; fixed-address 10.133.26.176;} +host trc17-rf { hardware ethernet 00:00:00:00:00:11; fixed-address 10.133.26.177;} +host trc18-rf { hardware ethernet 00:00:00:00:00:12; fixed-address 10.133.26.178;} +host trc19-rf { hardware ethernet 00:00:00:00:00:13; fixed-address 10.133.26.179;} +host trc20-rf { hardware ethernet 00:00:00:00:00:14; fixed-address 10.133.26.180;} +host trc21-rf { hardware ethernet 00:00:00:00:00:15; fixed-address 10.133.26.181;} +host trc22-rf { hardware ethernet 00:00:00:00:00:16; fixed-address 10.133.26.182;} +host trc23-rf { hardware ethernet 00:00:00:00:00:17; fixed-address 10.133.26.183;} +host trc24-rf { hardware ethernet 00:00:00:00:00:18; fixed-address 10.133.26.184;} +host trc25-rf { hardware ethernet 00:00:00:00:00:19; fixed-address 10.133.26.185;} #lames monitoring -host trc26-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.186;} -host trc27-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.187;} +host trc26-rf { hardware ethernet 00:00:00:00:00:1A; fixed-address 10.133.26.186;} +host trc27-rf { hardware ethernet 00:00:00:00:00:1B; 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:01; fixed-address 10.133.26.189;} -host trc30-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.190;} -host trc31-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.191;} +host trc28-rf { hardware ethernet 00:00:00:00:00:1C; fixed-address 10.133.26.188;} +host trc29-rf { hardware ethernet 00:00:00:00:00:1D; fixed-address 10.133.26.189;} +host trc30-rf { hardware ethernet 00:00:00:00:00:1E; fixed-address 10.133.26.190;} +host trc31-rf { hardware ethernet 00:00:00:00:00:1F; fixed-address 10.133.26.191;} subnet 10.133.28.0 netmask 255.255.255.0 { @@ -102,39 +102,39 @@ subnet 10.133.28.0 netmask 255.255.255.0 } #lame fusion, pistage, LSU -host trc01 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.161;} +host trc01 { hardware ethernet 00:00:00:00:01:01; fixed-address 10.133.28.161;} #lames gonio -host trc02 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.162;} -host trc03 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.163;} -host trc04 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.164;} -host trc05 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.165;} -host trc06 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.166;} -host trc07 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.167;} -host trc08 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.168;} -host trc09 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.169;} -host trc10 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.170;} -host trc11 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.171;} -host trc12 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.172;} -host trc13 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.173;} -host trc14 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.174;} -host trc15 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.175;} -host trc16 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.176;} -host trc17 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.177;} -host trc18 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.178;} -host trc19 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.179;} -host trc20 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.180;} -host trc21 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.181;} -host trc22 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.182;} -host trc23 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.183;} -host trc24 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.184;} -host trc25 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.185;} +host trc02 { hardware ethernet 00:00:00:00:01:02; fixed-address 10.133.28.162;} +host trc03 { hardware ethernet 00:00:00:00:01:03; fixed-address 10.133.28.163;} +host trc04 { hardware ethernet 00:00:00:00:01:04; fixed-address 10.133.28.164;} +host trc05 { hardware ethernet 00:00:00:00:01:05; fixed-address 10.133.28.165;} +host trc06 { hardware ethernet 00:00:00:00:01:06; fixed-address 10.133.28.166;} +host trc07 { hardware ethernet 00:00:00:00:01:07; fixed-address 10.133.28.167;} +host trc08 { hardware ethernet 00:00:00:00:01:08; fixed-address 10.133.28.168;} +host trc09 { hardware ethernet 00:00:00:00:01:09; fixed-address 10.133.28.169;} +host trc10 { hardware ethernet 00:00:00:00:01:0A; fixed-address 10.133.28.170;} +host trc11 { hardware ethernet 00:00:00:00:01:0B; fixed-address 10.133.28.171;} +host trc12 { hardware ethernet 00:00:00:00:01:0C; fixed-address 10.133.28.172;} +host trc13 { hardware ethernet 00:00:00:00:01:0D; fixed-address 10.133.28.173;} +host trc14 { hardware ethernet 00:00:00:00:01:0E; fixed-address 10.133.28.174;} +host trc15 { hardware ethernet 00:00:00:00:01:0F; fixed-address 10.133.28.175;} +host trc16 { hardware ethernet 00:00:00:00:01:10; fixed-address 10.133.28.176;} +host trc17 { hardware ethernet 00:00:00:00:01:11; fixed-address 10.133.28.177;} +host trc18 { hardware ethernet 00:00:00:00:01:12; fixed-address 10.133.28.178;} +host trc19 { hardware ethernet 00:00:00:00:01:13; fixed-address 10.133.28.179;} +host trc20 { hardware ethernet 00:00:00:00:01:14; fixed-address 10.133.28.180;} +host trc21 { hardware ethernet 00:00:00:00:01:15; fixed-address 10.133.28.181;} +host trc22 { hardware ethernet 00:00:00:00:01:16; fixed-address 10.133.28.182;} +host trc23 { hardware ethernet 00:00:00:00:01:17; fixed-address 10.133.28.183;} +host trc24 { hardware ethernet 00:00:00:00:01:18; fixed-address 10.133.28.184;} +host trc25 { hardware ethernet 00:00:00:00:01:19; fixed-address 10.133.28.185;} #lames monitoring -host trc26 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.186;} -host trc27 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.187;} +host trc26 { hardware ethernet 00:00:00:00:01:1A; fixed-address 10.133.28.186;} +host trc27 { hardware ethernet 00:00:00:00:01:1B; 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:01; fixed-address 10.133.26.189;} -host trc30 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.190;} -host trc31 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.28.191;} +host trc28 { hardware ethernet 00:00:00:00:01:1C; fixed-address 10.133.26.188;} +host trc29 { hardware ethernet 00:00:00:00:01:1D; fixed-address 10.133.26.189;} +host trc30 { hardware ethernet 00:00:00:00:01:1E; fixed-address 10.133.26.190;} +host trc31 { hardware ethernet 00:00:00:00:01:1F; fixed-address 10.133.28.191;} -- 2.30.2 From 967184bf485526f1009a50bbdef4fdb49300917a Mon Sep 17 00:00:00 2001 From: Laurent Mazet Date: Thu, 4 Dec 2014 12:10:11 +0100 Subject: [PATCH 14/16] clean /etc/hosts.* --- master/etc/hosts.12MHzDF | 100 +++++++++++------------------ master/etc/hosts.12MHzMDF | 132 +++++++++++++++----------------------- master/etc/hosts.30MHz | 125 ------------------------------------ master/etc/hosts.30MHzMDF | 99 ++++++++++++++++++++++++++++ master/etc/hosts.30MHzMHF | 53 +++++++++++++++ master/etc/hosts.8MHz | 64 ------------------ master/etc/hosts.8MHzMHF | 53 +++++++++++++++ 7 files changed, 295 insertions(+), 331 deletions(-) delete mode 100644 master/etc/hosts.30MHz create mode 100644 master/etc/hosts.30MHzMDF create mode 100644 master/etc/hosts.30MHzMHF delete mode 100644 master/etc/hosts.8MHz create mode 100644 master/etc/hosts.8MHzMHF diff --git a/master/etc/hosts.12MHzDF b/master/etc/hosts.12MHzDF index 1493bd3..2671a16 100644 --- a/master/etc/hosts.12MHzDF +++ b/master/etc/hosts.12MHzDF @@ -8,54 +8,28 @@ ff02::1 ip6-allnodes ff02::2 ip6-allrouters ff02::3 ip6-allhosts -# ============================================================================ -# 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 interfaces adresses eth1, chassis, fusion, lsu -# gps, fe306_x, ... -# - V1.2: Herve Petit 24/05/2010 -# RA-30095: MAJ @switch sw2: ajout vlan26 10.133.26.232 et changement vlan1 -# 10.133.28.131 -> 10.133.28.232 -# - V1.3: Herve Petit 27/01/2011 -# RA-30095: Prise en compte decision CFT -# swg: 10.133.26.231, swm: 10.133.28.231 -# - V1.4: Herve Petit 03/03/2011 -# Creation des alias acq_xx -# - V1.5: Laurent Mzaet 12/06/2013 -# 10.133.28.0/24 devient le reseau principal -# -# ATTENTION: le sigle "trc" doit etre utilise avec attention car -# il est parse par plusieurs scripts d'installation -# si une ligne est rajoutee contenant ce sigle, il faut reverifier le -# bon fonctionnement des scripts d'installation -# ============================================================================ - # =============================== # Reseau 10.133.26.0 -# ============================== +# =============================== -10.133.26.160 trc00-rf maitre-rf sup-rf fusion-rf enr00-rf -10.133.26.161 trc01-rf lsu-rf -10.133.26.162 trc02-rf acq00-rf gon00-rf -10.133.26.163 trc03-rf acq01-rf gon01-rf -10.133.26.164 trc04-rf acq02-rf gon02-rf -10.133.26.165 trc05-rf acq03-rf gon03-rf -10.133.26.166 trc06-rf acq04-rf gon04-rf -10.133.26.167 trc07-rf acq05-rf gon05-rf -10.133.26.168 trc08-rf acq06-rf gon06-rf -10.133.26.169 trc09-rf acq07-rf gon07-rf -10.133.26.170 trc10-rf acq08-rf gon08-rf -10.133.26.171 trc11-rf acq09-rf gon09-rf -10.133.26.172 trc12-rf acq10-rf gon10-rf -10.133.26.173 trc13-rf acq11-rf gon11-rf -10.133.26.174 trc14-rf acq12-rf gon12-rf -10.133.26.175 trc15-rf acq13-rf gon13-rf -10.133.26.176 trc16-rf acq14-rf gon14-rf -10.133.26.177 trc17-rf acq15-rf gon15-rf +10.133.26.160 trc00-rf maitre-rf sup-rf fusion-rf enr00-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.231 swg @@ -77,24 +51,24 @@ ff02::3 ip6-allhosts 10.133.28.159 amm00 10.133.28.158 amm01 -10.133.28.160 trc00 maitre sup fusion enr00 nfsserver -10.133.28.161 trc01 lsu -10.133.28.162 trc02 acq00 gon00 -10.133.28.163 trc03 acq01 gon01 -10.133.28.164 trc04 acq02 gon02 -10.133.28.165 trc05 acq03 gon03 -10.133.28.166 trc06 acq04 gon04 -10.133.28.167 trc07 acq05 gon05 -10.133.28.168 trc08 acq06 gon06 -10.133.28.169 trc09 acq07 gon07 -10.133.28.170 trc10 acq08 gon08 -10.133.28.171 trc11 acq09 gon09 -10.133.28.172 trc12 acq10 gon10 -10.133.28.173 trc13 acq11 gon11 -10.133.28.174 trc14 acq12 gon12 -10.133.28.175 trc15 acq13 gon13 -10.133.28.176 trc16 acq14 gon14 -10.133.28.177 trc17 acq15 gon15 +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.231 swm diff --git a/master/etc/hosts.12MHzMDF b/master/etc/hosts.12MHzMDF index 7525460..6f9d687 100644 --- a/master/etc/hosts.12MHzMDF +++ b/master/etc/hosts.12MHzMDF @@ -8,62 +8,36 @@ ff02::1 ip6-allnodes ff02::2 ip6-allrouters ff02::3 ip6-allhosts -# ============================================================================ -# 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 interfaces adresses eth1, chassis, fusion, lsu -# gps, fe306_x, ... -# - V1.2: Herve Petit 24/05/2010 -# RA-30095: MAJ @switch sw2: ajout vlan26 10.133.26.232 et changement vlan1 -# 10.133.28.131 -> 10.133.28.232 -# - V1.3: Herve Petit 27/01/2011 -# RA-30095: Prise en compte decision CFT -# swg: 10.133.26.231, swm: 10.133.28.231 -# - V1.4: Herve Petit 03/03/2011 -# Creation des alias acq_xx -# - V1.5: Laurent Mzaet 12/06/2013 -# 10.133.28.0/24 devient le reseau principal -# -# ATTENTION: le sigle "trc" doit etre utilise avec attention car -# il est parse par plusieurs scripts d'installation -# si une ligne est rajoutee contenant ce sigle, il faut reverifier le -# bon fonctionnement des scripts d'installation -# ============================================================================ - # =============================== # Reseau 10.133.26.0 -# ============================== +# =============================== -10.133.26.160 trc00-rf maitre-rf sup-rf fusion-rf enr00-rf -10.133.26.161 trc01-rf lsu-rf -10.133.26.162 trc02-rf acq00-rf gon00-rf -10.133.26.163 trc03-rf acq01-rf gon01-rf -10.133.26.164 trc04-rf acq02-rf gon02-rf -10.133.26.165 trc05-rf acq03-rf gon03-rf -10.133.26.166 trc06-rf acq04-rf gon04-rf -10.133.26.167 trc07-rf acq05-rf gon05-rf -10.133.26.168 trc08-rf acq06-rf gon06-rf -10.133.26.169 trc09-rf acq07-rf gon07-rf -10.133.26.170 trc10-rf acq08-rf gon08-rf -10.133.26.171 trc11-rf acq09-rf gon09-rf -10.133.26.172 trc12-rf acq10-rf gon10-rf -10.133.26.173 trc13-rf acq11-rf gon11-rf -10.133.26.174 trc14-rf acq12-rf gon12-rf -10.133.26.175 trc15-rf acq13-rf gon13-rf -10.133.26.176 trc16-rf acq14-rf gon14-rf -10.133.26.177 trc17-rf acq15-rf gon15-rf -10.133.26.178 trc18-rf mon00-rf -10.133.26.179 trc19-rf mon01-rf -10.133.26.180 trc20-rf mon02-rf -10.133.26.181 trc21-rf mon03-rf -10.133.26.182 trc22-rf mon04-rf -10.133.26.183 trc23-rf mon05-rf -10.133.26.184 trc24-rf mon06-rf -10.133.26.185 trc25-rf mon07-rf +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 mon00-rf +10.133.26.179 trc19-rf mon01-rf +10.133.26.180 trc20-rf mon02-rf +10.133.26.181 trc21-rf mon03-rf +10.133.26.182 trc22-rf mon04-rf +10.133.26.183 trc23-rf mon05-rf +10.133.26.184 trc24-rf mon06-rf +10.133.26.185 trc25-rf mon07-rf 10.133.26.231 swg @@ -85,32 +59,32 @@ ff02::3 ip6-allhosts 10.133.28.159 amm00 10.133.28.158 amm01 -10.133.28.160 trc00 maitre sup fusion enr00 nfsserver -10.133.28.161 trc01 lsu -10.133.28.162 trc02 acq00 gon00 -10.133.28.163 trc03 acq01 gon01 -10.133.28.164 trc04 acq02 gon02 -10.133.28.165 trc05 acq03 gon03 -10.133.28.166 trc06 acq04 gon04 -10.133.28.167 trc07 acq05 gon05 -10.133.28.168 trc08 acq06 gon06 -10.133.28.169 trc09 acq07 gon07 -10.133.28.170 trc10 acq08 gon08 -10.133.28.171 trc11 acq09 gon09 -10.133.28.172 trc12 acq10 gon10 -10.133.28.173 trc13 acq11 gon11 -10.133.28.174 trc14 acq12 gon12 -10.133.28.175 trc15 acq13 gon13 -10.133.28.176 trc16 acq14 gon14 -10.133.28.177 trc17 acq15 gon15 -10.133.28.178 trc18 mon00 -10.133.28.179 trc19 mon01 -10.133.28.180 trc20 mon02 -10.133.28.181 trc21 mon03 -10.133.28.182 trc22 mon04 -10.133.28.183 trc23 mon05 -10.133.28.184 trc24 mon06 -10.133.28.185 trc25 mon07 +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 mon00 +10.133.28.179 trc19 mon01 +10.133.28.180 trc20 mon02 +10.133.28.181 trc21 mon03 +10.133.28.182 trc22 mon04 +10.133.28.183 trc23 mon05 +10.133.28.184 trc24 mon06 +10.133.28.185 trc25 mon07 10.133.28.231 swm diff --git a/master/etc/hosts.30MHz b/master/etc/hosts.30MHz deleted file mode 100644 index 52bc279..0000000 --- a/master/etc/hosts.30MHz +++ /dev/null @@ -1,125 +0,0 @@ -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 - -# ============================================================================ -# 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 interfaces adresses eth1, chassis, fusion, lsu -# gps, fe306_x, ... -# - V1.2: Herve Petit 24/05/2010 -# RA-30095: MAJ @switch sw2: ajout vlan26 10.133.26.232 et changement vlan1 -# 10.133.28.131 -> 10.133.28.232 -# - V1.3: Herve Petit 27/01/2011 -# RA-30095: Prise en compte decision CFT -# swg: 10.133.26.231, swm: 10.133.28.231 -# - V1.4: Herve Petit 03/03/2011 -# Creation des alias acq_xx -# - V1.5: Laurent Mazet 12/06/2013 -# 10.133.28.0/24 devient le reseau principal -# -# ATTENTION: le sigle "trc" doit etre utilise avec attention car -# il est parse par plusieurs scripts d'installation -# si une ligne est rajoutee contenant ce sigle, il faut reverifier le -# bon fonctionnement des scripts d'installation -# ============================================================================ - -# =============================== -# Reseau 10.133.26.0 -# ============================== - -10.133.26.160 trc00-rf maitre-rf sup-rf fusion-rf enr00-rf -10.133.26.161 trc01-rf lsu-rf -10.133.26.162 trc02-rf acq00-rf gon00-rf -10.133.26.163 trc03-rf acq01-rf gon01-rf -10.133.26.164 trc04-rf acq02-rf gon02-rf -10.133.26.165 trc05-rf acq03-rf gon03-rf -10.133.26.166 trc06-rf acq04-rf gon04-rf -10.133.26.167 trc07-rf acq05-rf gon05-rf -10.133.26.168 trc08-rf acq06-rf gon06-rf -10.133.26.169 trc09-rf acq07-rf gon07-rf -10.133.26.170 trc10-rf acq08-rf gon08-rf -10.133.26.171 trc11-rf acq09-rf gon09-rf -10.133.26.172 trc12-rf acq10-rf gon10-rf -10.133.26.173 trc13-rf acq11-rf gon11-rf -10.133.26.174 trc14-rf acq12-rf gon12-rf -10.133.26.175 trc15-rf acq13-rf gon13-rf -10.133.26.176 trc16-rf acq14-rf gon14-rf -10.133.26.177 trc17-rf acq15-rf gon15-rf -10.133.26.178 trc18-rf acq16-rf gon16-rf -10.133.26.179 trc19-rf acq17-rf gon17-rf -10.133.26.180 trc20-rf acq18-rf gon18-rf -10.133.26.181 trc21-rf acq19-rf gon19-rf -10.133.26.182 trc22-rf acq20-rf gon20-rf -10.133.26.183 trc23-rf acq21-rf gon21-rf -10.133.26.184 trc24-rf acq22-rf gon22-rf -10.133.26.185 trc25-rf acq23-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 #swg2 -10.133.26.232 swg2 - -# =============================== -# Reseau 10.133.28.0 -# =============================== - -# prod fe306 1 110->118 -10.133.28.110 fe306-1 -# prod fe306 2 120->128 -10.133.28.120 fe306-2 -# prod fe306 3 130->138 -10.133.28.130 fe306-3 -# prod fe306 4 140->148 -10.133.28.140 fe306-4 -# prod fe306 5 150->158 -10.133.28.150 fe306-5 - -10.133.28.159 amm00 -10.133.28.158 amm01 - -10.133.28.160 trc00 maitre sup fusion enr00 nfsserver -10.133.28.161 trc01 lsu -10.133.28.162 trc02 acq00 gon00 -10.133.28.163 trc03 acq01 gon01 -10.133.28.164 trc04 acq02 gon02 -10.133.28.165 trc05 acq03 gon03 -10.133.28.166 trc06 acq04 gon04 -10.133.28.167 trc07 acq05 gon05 -10.133.28.168 trc08 acq06 gon06 -10.133.28.169 trc09 acq07 gon07 -10.133.28.170 trc10 acq08 gon08 -10.133.28.171 trc11 acq09 gon09 -10.133.28.172 trc12 acq10 gon10 -10.133.28.173 trc13 acq11 gon11 -10.133.28.174 trc14 acq12 gon12 -10.133.28.175 trc15 acq13 gon13 -10.133.28.176 trc16 acq14 gon14 -10.133.28.177 trc17 acq15 gon15 -10.133.28.178 trc18 acq16 gon16 -10.133.28.179 trc19 acq17 gon17 -10.133.28.180 trc20 acq18 gon18 -10.133.28.181 trc21 acq19 gon19 -10.133.28.182 trc22 acq20 gon20 -10.133.28.183 trc23 acq21 gon21 -10.133.28.184 trc24 acq22 gon22 -10.133.28.185 trc25 acq23 gon23 -10.133.28.186 trc26 mon00 -10.133.28.187 trc27 mon01 - -10.133.28.231 swm - -10.133.28.253 matrix -10.133.28.254 gps - -100.100.100.101 tmt diff --git a/master/etc/hosts.30MHzMDF b/master/etc/hosts.30MHzMDF new file mode 100644 index 0000000..e6efa49 --- /dev/null +++ b/master/etc/hosts.30MHzMDF @@ -0,0 +1,99 @@ +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 + +# =============================== +# Reseau 10.133.26.0 +# =============================== + +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.28.110 fe306-1 +# prod fe306 2 120->128 +10.133.28.120 fe306-2 +# prod fe306 3 130->138 +10.133.28.130 fe306-3 +# prod fe306 4 140->148 +10.133.28.140 fe306-4 +# prod fe306 5 150->158 +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.28.231 swm + +10.133.28.253 matrix +10.133.28.254 gps + +100.100.100.101 tmt diff --git a/master/etc/hosts.30MHzMHF b/master/etc/hosts.30MHzMHF new file mode 100644 index 0000000..276886d --- /dev/null +++ b/master/etc/hosts.30MHzMHF @@ -0,0 +1,53 @@ +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 + +# =============================== +# Reseau 10.133.26.0 +# =============================== + +10.133.26.160 trc00-rf maitre-rf sup-rf fusion-rf +10.133.26.161 trc01-rf acq00-rf +10.133.26.162 trc02-rf acq01-rf +10.133.26.163 trc03-rf acq02-rf +10.133.26.164 trc04-rf acq03-rf +10.133.26.165 trc05-rf acq04-rf +10.133.26.166 trc06-rf acq05-rf +10.133.26.167 trc07-rf mon00-rf +10.133.26.168 trc08-rf mon01-rf +10.133.26.169 trc09-rf enr00-rf + +10.133.26.231 swg swg1 + +# =============================== +# Reseau 10.133.28.0 +# =============================== + +# prod fe306 1 110->118 +10.133.28.110 fe306-1 + +10.133.28.159 amm00 + +10.133.28.160 trc00 maitre sup fusion nfsserver +10.133.28.161 trc01 acq00 +10.133.28.162 trc02 acq01 +10.133.28.163 trc03 acq02 +10.133.28.164 trc04 acq03 +10.133.28.165 trc05 acq04 +10.133.28.166 trc06 acq05 +10.133.28.167 trc07 mon00 +10.133.28.168 trc08 mon01 +10.133.28.169 trc09 enr00 + +10.133.28.231 swm + +10.133.28.253 matrix +10.133.28.254 gps + +100.100.100.101 tmt diff --git a/master/etc/hosts.8MHz b/master/etc/hosts.8MHz deleted file mode 100644 index 4d27f34..0000000 --- a/master/etc/hosts.8MHz +++ /dev/null @@ -1,64 +0,0 @@ -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 - -# ============================================================================ -# V1.0 -# Copyright (C) THALES. All rights reserved -# Author: Thomas Perennou -# -# ATTENTION: le sigle "trc" doit etre utilise avec attention car -# il est parse par plusieurs scripts d'installation -# si une ligne est rajoutee contenant ce sigle, il faut reverifier le -# bon fonctionnement des scripts d'installation -# ============================================================================ - -# =============================== -# Reseau 10.133.26.0 -# ============================== - -10.133.26.160 trc00-rf maitre-rf sup-rf fusion-rf -10.133.26.161 trc01-rf acq00-rf gon00-rf -10.133.26.162 trc02-rf acq01-rf gon01-rf -10.133.26.163 trc03-rf acq02-rf mon00-rf -10.133.26.164 trc04-rf acq03-rf mon01-rf -10.133.26.80 trc05-rf acq04-rf enr00-rf - -10.133.26.231 swg swg1 - -# =============================== -# Reseau 10.133.28.0 -# =============================== - -# prod fe306 1 110->118 -10.133.28.110 fe306-1 -# prod fe306 2 120->1285 -10.133.28.120 fe306-2 -# prod fe306 3 130->138 -10.133.28.130 fe306-3 -# prod fe306 4 140->148 -10.133.28.140 fe306-4 -# prod fe306 5 150->158 -10.133.28.150 fe306-5 - -10.133.28.159 amm00 - -10.133.28.160 trc00 maitre sup fusion nfsserver -10.133.28.161 trc01 acq00 gon00 -10.133.28.162 trc02 acq01 gon01 -10.133.28.163 trc03 acq02 mon00 -10.133.28.164 trc04 acq03 mon01 -10.133.28.80 trc05 acq04 enr00 - -10.133.28.231 swm - -10.133.28.253 matrix -10.133.28.254 gps - -100.100.100.101 tmt diff --git a/master/etc/hosts.8MHzMHF b/master/etc/hosts.8MHzMHF new file mode 100644 index 0000000..096f0b2 --- /dev/null +++ b/master/etc/hosts.8MHzMHF @@ -0,0 +1,53 @@ +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 + +# =============================== +# Reseau 10.133.26.0 +# =============================== + +10.133.26.160 trc00-rf maitre-rf sup-rf fusion-rf #enr00-rf +10.133.26.161 trc01-rf acq00-rf +10.133.26.162 trc02-rf acq01-rf +10.133.26.163 trc03-rf mon00-rf +10.133.26.164 trc04-rf mon01-rf +10.133.26.165 trc05-rf enr00-rf + +10.133.26.231 swg swg1 + +# =============================== +# Reseau 10.133.28.0 +# =============================== + +# prod fe306 1 110->118 +10.133.28.110 fe306-1 +# prod fe306 2 120->1285 +10.133.28.120 fe306-2 +# prod fe306 3 130->138 +10.133.28.130 fe306-3 +# prod fe306 4 140->148 +10.133.28.140 fe306-4 +# prod fe306 5 150->158 +10.133.28.150 fe306-5 + +10.133.28.159 amm00 + +10.133.28.160 trc00 maitre sup fusion nfsserver #enr00 +10.133.28.161 trc01 acq00 +10.133.28.162 trc02 acq01 +10.133.28.163 trc03 mon00 +10.133.28.164 trc04 mon01 +10.133.28.165 trc05 enr00 + +10.133.28.231 swm + +10.133.28.253 matrix +10.133.28.254 gps + +100.100.100.101 tmt -- 2.30.2 From 19c8e80a23f711e34ada8cbf68e468f917a33041 Mon Sep 17 00:00:00 2001 From: Laurent Mazet Date: Thu, 4 Dec 2014 12:34:06 +0100 Subject: [PATCH 15/16] add OS version in /etc/trc6500_os_version --- master/etc/trc6500_os_version | 1 + 1 file changed, 1 insertion(+) create mode 100644 master/etc/trc6500_os_version diff --git a/master/etc/trc6500_os_version b/master/etc/trc6500_os_version new file mode 100644 index 0000000..1aeb502 --- /dev/null +++ b/master/etc/trc6500_os_version @@ -0,0 +1 @@ +20141204 -- 2.30.2 From 23a964f33bfb3d6c95dc229526584d68d839cc7f Mon Sep 17 00:00:00 2001 From: Laurent Mazet Date: Thu, 4 Dec 2014 12:34:42 +0100 Subject: [PATCH 16/16] update debian package list --- master/root/debian-list.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/master/root/debian-list.txt b/master/root/debian-list.txt index a5a1979..49aa30a 100644 --- a/master/root/debian-list.txt +++ b/master/root/debian-list.txt @@ -230,6 +230,7 @@ sshfs ssmtp strace sudo +swb syslinux sysv-rc sysvinit -- 2.30.2