xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-09-09 03:38:16 +00:00
Code Issues Releases Wiki Activity

Merge branch 'lenovobuild2.13' of github.com:jjohnson42/xcat-core into lenovobuild2.13

Browse Source
This commit is contained in:
Jarrod Johnson
2017-11-16 15:03:47 -05:00
parent ccda90fc6d 229533cbda
commit a42fc626ca
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
xCAT-client/bin/pasu
View File

@@ -215,10 +215,13 @@ sub processoutput { #This way, one arbiter handles output, no interrupting
$line !~ /Lenovo ToolsCenterSuite CLI/i &&
$line !~ /Lenovo XClarity Essentials OneCLI/i &&
$line !~ /Invoking SHOW command .../i &&
$line !~ /start to convert cmd./i &&
$line !~ /Invoking SET command .../i &&
$line !~ /Connected to BMC by IP address/i &&
$line !~ /Succeeded running the command /i &&
$line !~ /Based on module version /i &&
$line !~ /Connected to BMC by IP address/i &&
$line !~ /Connected to BMC at IP address/i &&
$line !~ /Succeeded running the command /i &&
$line !~ /Succeed in running the command:/i &&
$line !~ /Succeed running command /i)) {
print $nodehdl{$readyh} . ": " . $line . "\n";
}

4
xCAT-client/pods/man1/rcons.1.pod
View File

@@ -18,6 +18,10 @@ If I<conserver-host> is specified, the conserver daemon on that host will be con
To exit the console session, enter: <ctrl>e c .
For confluent backed consoles, an extended outage of connectivity to the endpoint will result in an automated retry
of a randomized interval between 2 to 4 minutes. You can either close and reopen the console to force a quicker
reconnect, or `<ctrl>e o`a to request an immediate reconnect attempt.
=head1 B<Options>
=over 5

7
xCAT-server/lib/xcat/plugins/confluent.pm
View File

@@ -276,7 +276,12 @@ sub makeconfluentcfg {
@cfgents1 = $hmtab->getAllNodeAttribs([ 'cons', 'serialport', 'mgt', 'conserver', 'termserver', 'termport', 'consoleondemand' ]);
@cfgents2 = $nodepostab->getAllNodeAttribs([ 'rack', 'u', 'chassis', 'slot', 'room' ]);
@cfgents3 = $nodepostab->getAllNodeAttribs([ 'mpa', 'id' ]);
@cfgents4 = $nodepostab->getAllNodeAttribs([ 'node', 'switch', 'port', 'interface' ]);
@cfgents4 = $switchtab->getAllNodeAttribs([ 'node', 'switch', 'port', 'interface' ]);
my @switchnodes;
foreach my $ent (@cfgents4) {
if ($ent->{node}) { push @switchnodes, $ent->{node} }
}
@cfgents4 = $switchtab->getNodesAttribs(\@switchnodes, [ 'node', 'switch', 'port', 'interface' ]);
}