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

Fix various issues in confluent plugin

Browse Source 
confluent plugin was triggering perl warnings in various
situations.  Correct those mistakes.
This commit is contained in:
Jarrod Johnson 2017-01-20 14:59:28 -05:00
parent 9244449c27
commit bdcf94d4c2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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}) {