xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-31 03:12:30 +00:00
Code Issues Releases Wiki Activity

enhance configeth configure instnic

Browse Source
This commit is contained in:
bybai
2017-07-24 02:51:35 -04:00
parent 84de6fed26
commit f6b16d24bd
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
xCAT-server/lib/perl/xCAT/Postage.pm
View File

@@ -421,6 +421,9 @@ sub makescript {
#get the node type, service node or compute node
my $nodetype = getNodeType($node);
#get the node ip address
my $cnipaddr = xCAT::NetworkUtils->getipaddr($node);
#print "hello $cnipaddr $node";
#print Dumper($noderesent);
#print Dumper($routes);
#routes
@@ -556,7 +559,7 @@ sub makescript {
#$inc =~ s/#NODE#/$node/eg;
$inc =~ s/#MASTER_IP_ADDR#/$master_ip/eg;
$inc =~ s/\$NODE/$node/eg;
$inc =~ s/#IPADDR#/$cnipaddr/eg;
#$inc =~ s/#TABLE:([^:]+):([^:]+):([^:]+):BLANKOKAY#/tabdb($1,$2,$3,1)/eg;
$inc =~ s/#TABLE:([^:]+):([^:]+):([^#]+)#/xCAT::Template::tabdb($1,$2,$3)/eg;
$inc =~ s/#ROUTES_VARS_EXPORT#/$route_vars/eg;

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

@@ -25,6 +25,10 @@ tabdump(networks)
NODE=$NODE
export NODE
#get compute node ip address
IPADDR=#IPADDR#
export IPADDR
# get GROUP list
GROUP=#TABLE:nodelist:$NODE:groups#
export GROUP

8
xCAT/postscripts/configeth
View File

@@ -425,7 +425,6 @@ elif [ "$1" = "-s" ];then
str_inst_mask=''
str_inst_gateway=''
str_inst_mtu=''
if [ "$str_os_type" = "aix" ];then
logger -t xcat -p local4.err "configeth: aix does not support -s flag"
log_error "configeth on $NODE: aix does not support -s flag"
@@ -476,7 +475,7 @@ elif [ "$1" = "-s" ];then
fi
fi
else
str_lease_file=`ls /var/lib/dhclient/*$str_inst_nic* | grep lease >& /dev/null`
str_lease_file=`ls /var/lib/dhclient/*$str_inst_nic* | grep lease`
if [ -e "$str_lease_file" ];then
str_inst_ip=`grep fixed-address $str_lease_file | tail -n 1 | awk '{print $2}' | sed 's/;$//'`
str_inst_mask=`grep subnet-mask $str_lease_file | tail -n 1 | awk '{print $3}' | sed 's/;$//'`
@@ -498,13 +497,16 @@ elif [ "$1" = "-s" ];then
fi
fi
fi
if [ -n "$IPADDR" ];then
str_inst_ip=$IPADDR
fi
if [ -n "$MACADDRESS" ];then
str_inst_mac=$MACADDRESS
else
#str_inst_mac=`ifconfig $str_inst_nic | grep HWaddr | awk -F'HWaddr' '{print $2}' | sed 's/\s*//'`
str_inst_mac=`ip link show $netdev | grep ether | awk '{print $2}'`
fi
if [ -z "$str_inst_ip" -o -z "$str_inst_mask" ];then
logger -t xcat -p local4.err "configeth: config install nic, can not find the information from lease file, return."
log_info "configeth on $NODE: config install nic, can not find information from dhcp lease file, return."