xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 17:23:08 +00:00
Code Issues Releases Wiki Activity

Fix issue 5721: xCAT-client rpm seems to depend on xCAT-server (#5826)

Browse Source
This commit is contained in:
zet809 2018-11-21 13:49:17 +08:00 committed by yangsong
parent 470e739c80
commit 2cc06ef0b7
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
perl-xCAT/xCAT/FSPpower.pm
View File

@ -8,7 +8,6 @@ use xCAT::PPCcli qw(SUCCESS EXPECT_ERROR RC_ERROR NR_ERROR);
use xCAT::PPCpower;
use xCAT::FSPUtils;
use xCAT::GlobalDef;
use xCAT_monitoring::monitorctrl;
#use Data::Dumper;
@ -183,6 +182,7 @@ sub powercmd_boot {
}
}
if (%newnodestatus) {
require xCAT_monitoring::monitorctrl;
xCAT_monitoring::monitorctrl::setNodeStatusAttributes(\%newnodestatus, 1);
}
return (\@output);
@ -364,6 +364,7 @@ sub powercmd {
}
if (%newnodestatus) {
require xCAT_monitoring::monitorctrl;
xCAT_monitoring::monitorctrl::setNodeStatusAttributes(\%newnodestatus, 1);
}
return (\@output);

1
perl-xCAT/xCAT/PPCboot.pm
View File

@ -614,6 +614,7 @@ sub rnetboot {
my $newstat = $::STATUS_POWERING_ON;
my %newnodestatus = ();
$newnodestatus{$newstat} = [$node];
require xCAT_monitoring::monitorctrl;
xCAT_monitoring::monitorctrl::setNodeStatusAttributes(\%newnodestatus, 1);
return ([ [ $node, "Success", $Rc ] ]);
}

3
perl-xCAT/xCAT/PPCpower.pm
View File

@ -9,7 +9,6 @@ use xCAT::MsgUtils;
use xCAT::FSPpower;
use xCAT::GlobalDef;
use xCAT_monitoring::monitorctrl;
##########################################################################
# Parse the command line for options and operands
@ -301,6 +300,7 @@ sub powercmd_boot {
}
}
require xCAT_monitoring::monitorctrl;
xCAT_monitoring::monitorctrl::setNodeStatusAttributes(\%newnodestatus, 1);
return (\@output);
}
@ -423,6 +423,7 @@ sub powercmd {
}
}
}
require xCAT_monitoring::monitorctrl;
xCAT_monitoring::monitorctrl::setNodeStatusAttributes(\%newnodestatus, 1);
return (\@result);
}