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

Merge pull request #2433 from jjohnson42/fixvitalsman

Browse Source 
Amend man page for rvitals
This commit is contained in:
Yuan Bai
2017-01-26 12:19:07 +08:00
committed by GitHub
parent b6be4d0c1c bdcf94d4c2
commit 2b19ff36eb
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xCAT-client/pods/man1/rvitals.1.pod
View File

@ -82,12 +82,14 @@ Retrieves power status.
=item B<powertime>
Retrieves total power uptime. This value only increases, unless
the Service Processor flash gets updated.
the Service Processor flash gets updated. This option is not valid
for x86 architecture systems.
=item B<reboot>
Retrieves total number of reboots. This value only increases,
unless the Service Processor flash gets updated.
unless the Service Processor flash gets updated. This option
is not valid for x86 architecture systems.
=item B<state>

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

@ -342,7 +342,7 @@ sub makeconfluentcfg {
die "confluent does not currently support termserver";
$termservers{ $_->{termserver} } = 1; # dont add this one again
}
if ($type{ $_->{node} } =~ /fsp|bpa|hmc|ivm/) {
if ($type{$_->{node}} and $type{ $_->{node} } =~ /fsp|bpa|hmc|ivm/) {
$keepdoing = 0; # these types dont have consoles
}
}
@ -450,14 +450,16 @@ sub donodeent {
}
my %parameters;
if ($cmeth) { $parameters{'console.method'} = $cmeth; }
if ($cmeth eq 'ipmi' or not $cmeth) {
if (not $cmeth or $cmeth eq 'ipmi') {
$parameters{'secret.hardwaremanagementuser'} =
$ipmiauthdata->{$node}->{username};
$parameters{'secret.hardwaremanagementpassword'} =
$ipmiauthdata->{$node}->{password};
my $bmc = $ipmientries->{$node}->[0]->{bmc};
$bmc =~ s/,.*//;
$parameters{'hardwaremanagement.manager'} = $bmc;
if ($bmc) {
$bmc =~ s/,.*//;
$parameters{'hardwaremanagement.manager'} = $bmc;
}
}
if (defined($cfgent->{consoleondemand})) {
if ($cfgent->{consoleondemand}) {