xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-18 20:30:56 +00:00
Code Issues Releases Wiki Activity

more modification...

Browse Source
This commit is contained in:
Casandra Qiu
2016-08-03 09:25:28 -04:00
parent 5d4d0d169e
commit 4b859aea8a
3 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xCAT-server/lib/xcat/plugins/switchdiscover.pm
View File

@ -459,7 +459,7 @@ sub process_request {
if ($key !~ /nomac/) {
$mac = $key;
}
my $msg = sprintf $format, $ip, $name, $vendor, $key;
my $msg = sprintf $format, $ip, $name, $vendor, $mac;
send_msg(\%request, 0, $msg);
}
}
@ -1363,11 +1363,7 @@ sub switchsetup {
my $outhash = shift;
my $request = shift;
my $sub_req = shift;
my $ret;
my @switchnode = ();
my $switchInfo;
my $output;
my $dshcmd;
my $static_ip;
my $discover_switch;
my $nodes_to_config;

4
xCAT-server/share/xcat/tools/configBNT
View File

@ -327,9 +327,7 @@ sub config_snmp {
if (@config_switches) {
#update switch status
my $csw = join(",",@config_switches);
$cmd = "chdef $csw status=switch_configed" ;
$rc= xCAT::Utils->runcmd($cmd, 0);
$cmd = "chtab switch=$csw switches.snmpversion=3 switches.auth=sha switches.username=$snmp_user switches.password=$snmp_passwd" ;
$cmd = "chdef $csw status=switch_configed snmpversion=3 snmpauth=sha snmpusername=$snmp_user snmppassword=$snmp_passwd";
$rc= xCAT::Utils->runcmd($cmd, 0);
}
}

10
xCAT-server/share/xcat/tools/configMellanox
View File

@ -78,7 +78,7 @@ if ($::SWITCH)
exit(1);
}
} else {
xCAT::MsgUtils->message("E","Invalid flag, please provide switches with --range");
xCAT::MsgUtils->message("E","Invalid flag, please provide switches with --switches");
&usage;
exit(1);
}
@ -248,10 +248,10 @@ sub usage
{
print "Usage:
configMellonax [-?│-h│--help]
configMellonax [--range switchnames] [--all]
configMellonax [--range switchnames] [--ip]
configMellonax [--range switchnames] [--name]
configMellonax [--range switchnames] [--config]
configMellonax [--switches switchnames] [--all]
configMellonax [--switches switchnames] [--ip]
configMellonax [--switches switchnames] [--name]
configMellonax [--switches switchnames] [--config]
\n";
}