arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow specifying mtu and connected_mode settings in configeth and configib per request from defect 3567

Browse Source
This commit is contained in:
linggao
2014-12-04 09:32:59 -05:00
parent bb8b43eeac
commit 729907f7eb
6 changed files with 262 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
perl-xCAT/xCAT/ProfiledNodeUtils.pm
View File

@@ -277,7 +277,7 @@ sub get_nodes_nic_attrs{
my $nodes = shift;
my $nicstab = xCAT::Table->new( 'nics');
my $entry = $nicstab->getNodesAttribs($nodes, ['nictypes', 'nichostnamesuffixes', 'nichostnameprefixes', 'niccustomscripts', 'nicnetworks', 'nicips']);
my $entry = $nicstab->getNodesAttribs($nodes, ['nictypes', 'nichostnamesuffixes', 'nichostnameprefixes', 'niccustomscripts', 'nicnetworks', 'nicips', 'nicextraparams']);
my %nicsattrs;
my @nicattrslist;
@@ -361,6 +361,19 @@ sub get_nodes_nic_attrs{
$nicsattrs{$node}{$nicattrs[0]}{'ip'} = $nicattrs[1];
}
}
if($entry->{$node}->[0]->{'nicextraparams'}){
@nicattrslist = split(",", $entry->{$node}->[0]->{'nicextraparams'});
foreach (@nicattrslist){
my @nicattrs;
if ($_ =~ /!/) {
@nicattrs = split("!", $_);
} else {
@nicattrs = split(":", $_);
}
$nicsattrs{$node}{$nicattrs[0]}{'extraparams'} = $nicattrs[1];
}
}
}
return \%nicsattrs;

14
perl-xCAT/xCAT/Schema.pm
View File

@@ -1420,7 +1420,7 @@ firmware => {
},
nics => {
cols => [qw(node nicips nichostnamesuffixes nichostnameprefixes nictypes niccustomscripts nicnetworks nicaliases comments disable)],
cols => [qw(node nicips nichostnamesuffixes nichostnameprefixes nictypes niccustomscripts nicnetworks nicaliases nicextraparams comments disable)],
keys => [qw(node)],
tablespace =>'XCATTBS16K',
table_desc => 'Stores NIC details.',
@@ -1457,6 +1457,12 @@ nics => {
Format: eth0!<alias list>,eth1!<alias1 list>|<alias2 list>
For multiple aliases per nic use a space-separated list.
For example: eth0!moe larry curly,eth1!tom|jerry',
nicextraparams => 'Comma-separated list of extra parameters that will be used for each NIC configuration.
If only one ip address is associated with each NIC:
<nic1>!<param1=value1 param2=value2>,<nic2>!<param3=value3>, for example, eth0!MTU=1500,ib0!MTU=65520 CONNECTED_MODE=yes.
If multiple ip addresses are associated with each NIC:
<nic1>!<param1=value1 param2=value2>|<param3=value3>,<nic2>!<param4=value4 param5=value5>|<param6=value6>, for example, eth0!MTU=1500|MTU=1460,ib0!MTU=65520 CONNECTED_MODE=yes.
The xCAT object definition commands support to use nicextraparams.<nicname> as the sub attributes.',
comments => 'Any user-written notes.',
disable => "Set to 'yes' or '1' to comment out this row.",
},
@@ -2383,7 +2389,11 @@ my @nodeattrs = (
tabentry => 'nics.nicaliases',
access_tabentry => 'nics.node=attr:node',
},
######################
{attr_name => 'nicextraparams',
tabentry => 'nics.nicextraparams',
access_tabentry => 'nics.node=attr:node',
},
#######################
# prodkey table #
######################
{attr_name => 'productkey',

2
xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
View File

@@ -547,7 +547,7 @@ sub processArgs
# --nics is the equivalent of -i nicips,nichostnamesuffixes...
if ($::opt_nics) {
$::opt_i="nicips,nichostnamesuffixes,nichostnameprefixes,nictypes,niccustomscripts,nicnetworks,nicaliases";
$::opt_i="nicips,nichostnamesuffixes,nichostnameprefixes,nictypes,niccustomscripts,nicnetworks,nicaliases,nicextraparams";
}
# -i and -s cannot be used together

3
xCAT-server/share/xcat/mypostscript/mypostscript.tmpl
View File

@@ -121,6 +121,9 @@ export NICCUSTOMSCRIPTS
NICNETWORKS=#TABLE:nics:$NODE:nicnetworks#
export NICNETWORKS
NICEXTRAPARAMS=#TABLE:nics:$NODE:nicextraparams#
export NICEXTRAPARAMS
CFGMGR=#TABLE:cfgmgt:$NODE:cfgmgr#
export CFGMGR

129
xCAT/postscripts/configeth
View File

@@ -3,6 +3,71 @@
# Internal script used by confignics only.
# It configs the Ethernet adpaters on the node
# The extra parameter are specified in the nics.nicextraparams.
# It has the following format:
# eth2!MTU=65520 somethingelse=yes,eth3!MTU=1500
# This function gets the values for the given nic,
# It stores each parameter values in a separate array.
function get_nic_extra_params() {
nic=$1
if [ ! "$NICEXTRAPARAMS" ];then
return
fi
old_ifs=$IFS
IFS=$','
array_conf_temp=($NICEXTRAPARAMS)
IFS=$old_ifs
i=0
while [ $i -lt ${#array_conf_temp[@]} ]
do
token="${array_conf_temp[$i]}"
D=
if echo "$token" | grep "!"; then
D="!"
else
D=":"
fi
key=`echo "$token" | cut -d"$D" -f 1`
if [ "$key" == "$nic" ]; then
str_temp_value=`echo "$token" | cut -d"$D" -f 2`
#echo "token=$token, str_temp_value=$str_temp_value"
old_ifs=$IFS
IFS=$'|'
nic_params_temp=($str_temp_value)
IFS=$old_ifs
j=0
while [ $j -lt ${#nic_params_temp[@]} ]
do
#token1="${nic_params_temp[$j]}"
#echo "token1=$token1"
old_ifs=$IFS
IFS=$' '
params_temp=(${nic_params_temp[$j]})
IFS=$old_ifs
k=0
while [ $k -lt ${#params_temp[@]} ]
do
token2="${params_temp[$k]}"
key=`echo "$token2" | cut -d'=' -f 1`
value=`echo "$token2" | cut -d'=' -f 2`
#echo "key=$key, value=$value"
if [ "$key" = "mtu" ] || [ "$key" = "MTU" ]; then
array_nic_mtu[$j]=$value
fi
k=$((k+1))
done
if [[ -z "${array_nic_mtu[$j]}" ]]; then
array_nic_mtu[$j]=$str_default_token
fi
j=$((j+1))
done
return
fi
i=$((i+1))
done
}
if [ "$(uname -s|tr 'A-Z' 'a-z')" = "linux" ];then
str_dir_name=`dirname $0`
. $str_dir_name/xcatlib.sh
@@ -14,6 +79,7 @@ function configipv4(){
str_v4net=$3
str_v4mask=$4
num_v4num=$5
str_mtu=$6
if [ "$str_os_type" = "sles" ];then
str_conf_file="/etc/sysconfig/network/ifcfg-${str_if_name}"
@@ -26,11 +92,17 @@ function configipv4(){
echo "STARTMODE=onboot" >> $str_conf_file
echo "USERCONTROL=no" >> $str_conf_file
echo "_nm_name=static-0" >> $str_conf_file
if [ "$str_mtu" != "$str_default_token" ]; then
echo "MTU=${str_mtu}" >> $str_conf_file
fi
else
echo "IPADDR_${num_v4num}=${str_v4ip}" >> $str_conf_file
echo "NETMASK_${num_v4num}=${str_v4mask}" >> $str_conf_file
echo "NETWORK_${num_v4num}=${str_v4net}" >> $str_conf_file
echo "LABEL_${num_v4num}=${num_v4num}" >> $str_conf_file
if [ "$str_mtu "!= "$str_default_token" ]; then
echo "MTU_${num_v4num}=${str_mtu}" >> $str_conf_file
fi
fi
if [[ ${str_if_name} == [a-zA-Z0-9]*.[0-9]* ]]; then
@@ -49,6 +121,9 @@ function configipv4(){
echo " address ${str_v4ip}" >> $str_conf_file
echo " netmask ${str_v4mask}" >> $str_conf_file
echo " network ${str_v4net}" >> $str_conf_file
if [ "$str_mtu" != "$str_default_token" ]; then
echo " mtu ${str_mtu}" >> $str_conf_file
fi
if [[ ${str_if_name} == [a-zA-Z0-9]*.[0-9]* ]]; then
parent_device=`echo ${str_if_name} | sed -e 's/\([a-zA-Z0-9]*\)\.[0-9]*/\1/g'`
echo " vlan-raw-device ${parent_device}" >> $str_conf_file
@@ -64,6 +139,7 @@ function configipv4(){
echo "DEVICE=${str_if_name}:${num_v4num}" > $str_conf_file
fi
echo "BOOTPROTO=static" >> $str_conf_file
echo "NM_CONTROLLED=no" >> $str_conf_file
echo "IPADDR=${str_v4ip}" >> $str_conf_file
@@ -72,6 +148,9 @@ function configipv4(){
if [[ ${str_if_name} == [a-zA-Z0-9]*.[0-9]* ]]; then
echo "VLAN=yes" >> $str_conf_file
fi
if [ "$str_mtu" != "$str_default_token" ]; then
echo "MTU=${str_mtu}" >> $str_conf_file
fi
fi
}
@@ -83,6 +162,8 @@ configipv6(){
num_v6num=$5
num_v4num=$6
str_v6gateway=$7
str_mtu=$8
#remove the prefix length from the subnet
str_v6net=`echo $str_v6net | cut -d"/" -f 1`
@@ -101,12 +182,15 @@ configipv6(){
echo "LABEL_ipv6${num_v6num}=ipv6$num_v6num" >> $str_conf_file
echo "IPADDR_ipv6${num_v6num}=${str_v6ip}" >> $str_conf_file
echo "PREFIXLEN_ipv6${num_v6num}=${str_v6prefix}" >> $str_conf_file
if [ `echo $str_v6gateway | grep -v 'xcatmaster'` ];then
if [ "$str_v6gateway" != "$str_default_token" ] -a [ `echo $str_v6gateway | grep -v 'xcatmaster'` ];then
grep -E "default[:space:]+${str_v6gateway}[:space:]+" /etc/sysconfig/network/routes 2>&1 1>/dev/null
if [ $? -ne 0 ];then
echo "default $str_v6gateway - -" >> /etc/sysconfig/network/routes
fi
fi
if [ "$str_mtu" != "$str_default_token" ]; then
echo "MTU=${str_mtu}" >> $str_conf_file
fi
elif [ "$str_os_type" = "debian" ];then
#debian or ubuntu
str_conf_file="/etc/network/interfaces.d/${str_if_name}"
@@ -118,9 +202,12 @@ configipv6(){
echo "iface ${str_if_name} inet6 static" >> $str_conf_file
echo " address ${str_v6ip}" >> $str_conf_file
echo " netmask ${str_v6prefix}" >> $str_conf_file
if [ $str_v6gateway ];then
if [ "$str_v6gateway" != "$str_default_token" ]; then
echo " gateway ${str_v6gateway}" >> $str_conf_file
fi
if [ "$str_mtu" != "$str_default_token" ]; then
echo " mtu ${str_mtu}" >> $str_conf_file
fi
else
echo " post-up /sbin/ifconfig ${str_if_name} inet6 add ${str_v6ip}/${str_v6prefix}" >> $str_conf_file
echo " pre-down /sbin/ifconfig ${str_if_name} inet6 del ${str_v6ip}/${str_v6prefix}" >> $str_conf_file
@@ -140,9 +227,12 @@ configipv6(){
else
echo "IPV6ADDR_SECONDARIES=${str_v6ip}/${str_v6prefix}" >> $str_conf_file
fi
if [ `echo $str_v6gateway | grep -v 'xcatmaster'` ];then
if [ "$str_v6gateway" != "$str_default_token" ] -a [ `echo $str_v6gateway | grep -v 'xcatmaster'` ];then
echo "IPV6_DEFAULTGW=$str_v6gateway" >> $str_conf_file
fi
if [ "$str_mtu" != "$str_default_token" ]; then
echo "MTU=${str_mtu}" >> $str_conf_file
fi
fi
}
@@ -222,6 +312,9 @@ function add_ip_temporary(){
fi
}
# This token is used for the value of an attributes that has not been assigned any value.
str_default_token="default"
str_nic_name=''
str_os_type=`uname | tr 'A-Z' 'a-z'`
str_cfg_dir=''
@@ -447,6 +540,7 @@ declare -a array_nic_network_config
declare -a array_nic_subnet
declare -a array_nic_netmask
declare -a array_nic_gateway
declare -a array_nic_mtu
str_ip_mask_pair=''
num_index=1
@@ -465,6 +559,9 @@ while [ $num_index -le $NETWORKS_LINES ];do
num_index=$((num_index+1))
done
#get extra configration parameters for each nic
get_nic_extra_params $str_nic_name
logger -t xcat -p local4.err "configeth: new configuration"
echo "configeth on $NODE: new configuration"
num_index=0
@@ -667,6 +764,17 @@ else
bool_modify_flag=1
fi
#check if mtu value has been changed or not
new_mtu=${array_nic_mtu[0]}
if [ "$new_mtu" != "$str_default_token" ]; then
old_mtu=`ip addr show dev $str_nic_name | grep mtu | awk '{print $5}'`
#echo "old=$old_mtu, new=$new_mtu"
if [ "$new_mtu" != "$old_mtu" ]; then
bool_restart_flag=1
bool_modify_flag=1
fi
fi
if [ $bool_restart_flag = 0 ];then
#add the new defined ip
old_ifs=$IFS
@@ -735,16 +843,24 @@ else
str_subnet=${array_nic_subnet[$num_index]}
str_netmask=${array_nic_netmask[$num_index]}
str_gateway=${array_nic_gateway[$num_index]}
if [ ! $str_subnet -o ! $str_netmask ];then
str_mtu=${array_nic_mtu[$num_index]}
# make sure each parameter has a value
if [[ -z "$str_gateway" ]]; then
str_gateway=$str_default_token
fi
if [ ! $str_subnet -o ! $str_netmask ];then
num_index=$((num_index+1))
continue
fi
if [ `echo $str_ip | grep -E '^([0-9]{1,3}\.){3}[0-9]{1,3}$'` ];then
configipv4 $str_nic_name $str_ip $str_subnet $str_netmask $num_ipv4_index
configipv4 $str_nic_name $str_ip $str_subnet $str_netmask $num_ipv4_index $str_mtu
num_ipv4_index=$((num_ipv4_index+1))
elif [ `echo $str_ip | grep -E ":"` ];then
configipv6 $str_nic_name $str_ip $str_subnet $str_netmask $num_ipv6_index $num_ipv4_index $str_gateway
configipv6 $str_nic_name $str_ip $str_subnet $str_netmask $num_ipv6_index $num_ipv4_index $str_gateway $str_mtu
num_ipv6_index=$((num_ipv6_index+1))
else
num_index=$((num_index+1))
@@ -762,6 +878,7 @@ else
if [ "$str_os_type" = "debian" ];then
ifup -a -i /etc/network/interfaces.d/$str_nic_name
else
echo "bring up ip"
ifup $str_nic_name
fi
fi

112
xCAT/postscripts/configib
View File

@@ -62,6 +62,76 @@ convert_netmask_to_cidr() {
}
# The extra parameter are specified in the nics.nicextraparams.
# It has the following format:
# eth2!MTU=65520 CONNECTED_MODE=yes,eth3!MTU=1500
# This function gets the values for the given nic,
# It stores each parameter values in a separate array.
function get_nic_extra_params() {
nic_temp=$1
if [ ! "$NICEXTRAPARAMS" ];then
return
fi
old_ifs=$IFS
IFS=$','
array_conf_temp=($NICEXTRAPARAMS)
IFS=$old_ifs
i=0
while [ $i -lt ${#array_conf_temp[@]} ]
do
token="${array_conf_temp[$i]}"
D=
if echo "$token" | grep "!"; then
D="!"
else
D=":"
fi
key=`echo "$token" | cut -d"$D" -f 1`
if [ "$key" == "$nic_temp" ]; then
str_temp_value=`echo "$token" | cut -d"$D" -f 2`
#echo "token=$token, str_temp_value=$str_temp_value"
old_ifs=$IFS
IFS=$'|'
nic_params_temp=($str_temp_value)
IFS=$old_ifs
j=0
while [ $j -lt ${#nic_params_temp[@]} ]
do
#token1="${nic_params_temp[$j]}"
#echo "token1=$token1"
old_ifs=$IFS
IFS=$' '
params_temp=(${nic_params_temp[$j]})
IFS=$old_ifs
k=0
while [ $k -lt ${#params_temp[@]} ]
do
token2="${params_temp[$k]}"
key=`echo "$token2" | cut -d'=' -f 1`
value=`echo "$token2" | cut -d'=' -f 2`
#echo "key=$key, value=$value"
if [ "$key" = "mtu" ] || [ "$key" = "MTU" ]; then
array_nic_mtu[$j]=$value
elif [ "$key" = "connected_mode" ] || [ "$key" = "CONNECTED_MODE" ]; then
array_nic_connected[$j]=$value
fi
k=$((k+1))
done
if [[ -z "${array_nic_mtu[$j]}" ]]; then
array_nic_mtu[$j]=$str_default_token
fi
if [[ -z "${array_nic_connected[$j]}" ]]; then
array_nic_connected[$j]=$str_default_token
fi
j=$((j+1))
done
fi
i=$((i+1))
done
}
#if $NIC_IBNICS is not defined, all ib nics' configuration files will be deleted.
if [ -z "$NIC_IBNICS" ]; then
echo "nothing to do."
@@ -221,6 +291,11 @@ else
fi
declare -a array_nic_mtu
declare -a array_nic_connected
# This token is used for the value of an attributes that has not been assigned any value.
str_default_token="default"
goodnics=""
for nic in `echo "$NIC_IBNICS" | tr "," "\n"`
do
@@ -256,6 +331,10 @@ do
continue
fi
array_nic_mtu=()
array_nic_connected=()
get_nic_extra_params $nic
ipindex=0
for nicip in `echo $nicips | tr "|" "\n"`
do
@@ -328,7 +407,9 @@ do
gateway=''
fi
str_mtu=${array_nic_mtu[$ipindex-1]}
str_connect_mode=${array_nic_connected[$ipindex-1]}
if [ $PLTFRM == "Linux" ]
then
# Issue openibd for Linux at boot time
@@ -378,7 +459,13 @@ IPADDR=$nicip" > $dir/ifcfg-$nic
echo "default $gateway - -" >> /etc/sysconfig/network/routes
fi
fi
else # not the first ip address
if [ -n "$str_mtu" -a "$str_mtu" != "$str_default_token" ]; then
echo "MTU=${str_mtu}" >> $dir/ifcfg-$nic
fi
if [ -n "$str_connect_mode" -a "$str_connect_mode" != "$str_default_token" ]; then
echo "CONNECTED_MODE=${str_connect_mode}" >> $dir/ifcfg-$nic
fi
else # not the first ip address
echo "LABEL_$ipindex=$ipindex
IPADDR_$ipindex=$nicip" >> $dir/ifcfg-$nic
# ipv6
@@ -425,6 +512,12 @@ IPADDR=$nicip" > $dir/ifcfg-$nic
if [ -n "$gateway" ]; then
echo "GATEWAY=$gateway" >> $dir/ifcfg-$nic
fi
if [ -n "$str_mtu" -a "$str_mtu" != "$str_default_token" ]; then
echo "MTU=${str_mtu}" >> $dir/ifcfg-$nic
fi
if [ -n "$str_connect_mode" -a "$str_connect_mode" != "$str_default_token" ]; then
echo "CONNECTED_MODE=${str_connect_mode}" >> $dir/ifcfg-$nic
fi
else # not the first ip address
# ipv6
if echo $nicip | grep : 2>&1 1>/dev/null
@@ -460,6 +553,12 @@ IPADDR=$nicip" > $dir/ifcfg-$nic:$ipindex
if [ -n "$gateway" ]; then
echo "GATEWAY=$gateway" >> $dir/ifcfg-$nic:$ipindex
fi
if [ -n "$str_mtu" -a "$str_mtu" != "$str_default_token" ]; then
echo "MTU=${str_mtu}" >> $dir/ifcfg-$nic:$ipindex
fi
if [ -n "$str_connect_mode" -a "$str_connect_mode" != "$str_default_token" ]; then
echo "CONNECTED_MODE=${str_connect_mode}" >> $dir/ifcfg-$nic:$ipindex
fi
# need to run ifup eth1:1 for RedHat
goodnics="$goodnics,$nic:$ipindex"
fi
@@ -513,6 +612,13 @@ netmask $netmask" >> /etc/network/interfaces
# echo "gateway $gateway" >> /etc/network/interfaces
#fi
fi
if [ -n "$str_mtu" -a "$str_mtu" != "$str_default_token" ]; then
echo "mtu ${str_mtu}" >> /etc/network/interfaces
fi
if [ -n "$str_connect_mode" -a "$str_connect_mode" != "$str_default_token" ]; then
echo "connected_mode ${str_connect_mode}" >> /etc/network/interfaces
fi
fi
else
echo "Unsupported operating system"
@@ -607,7 +713,7 @@ then
ifup $tmp > /dev/null 2>&1
done
else
ifup $nic > /dev/null 2>&1
ifup $nic > /dev/null 2>&1
fi
fi
done