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

Updated relevant comments in ipmi.pm. Removed rflash_delay description from Schema.pm and documentation/man pages

Browse Source
This commit is contained in:
Patrick Lundgren
2016-03-21 14:54:48 -04:00
parent ed4469b3b0
commit bbe6b6b35c
4 changed files with 3 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docs/source/guides/admin-guides/manage_clusters/ppc64le/management.rst
View File

@ -108,16 +108,8 @@ Check firmware version of the node and the HPM file: ::
Update node firmware to the version of the HPM file
**ATTENTION**
* Currently rflash is not stable enough to select accurate time before
upgrading. A ``rflash_delay`` attribute can be set in site table to adjust the
wait time before upgrading. We suggest setting this value to 70 which means
wait 70 secondes after BMC reset cold.
::
chdef -t site clustersite rflash_delay=70
rflash cn1 /firmware/8335_810.1543.20151021b_update.hpm
Configures Nodes' Service Processors

4
docs/source/guides/admin-guides/references/man5/site.5.rst
View File

@ -235,10 +235,6 @@ site Attributes:
snmpc: The snmp community string that xcat should use when communicating with the
switches.
rflash_delay: Only for rflash command to upgrade firmware on OpenPOWER servers.
This attribute is delay time to wait for the firmware initialization
after cold reset. Default value is 120 in seconds. If set to 0, no delay.
---------------------------
INSTALL/DEPLOYMENT ATTRIBUTES
---------------------------

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

@ -1070,9 +1070,6 @@ site => {
" through HMC. Default is 0.\n\n".
" snmpc: The snmp community string that xcat should use when communicating with the\n".
" switches.\n\n".
" rflash_delay: Only for rflash command to upgrade firmware on OpenPOWER servers.\n".
" This attribute is delay time to wait for the firmware initialization\n".
" after cold reset. Default value is 120 in seconds. If set to 0, no delay.\n\n".
" ---------------------------\n".
"INSTALL/DEPLOYMENT ATTRIBUTES\n".
" ---------------------------\n".

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

@ -1605,6 +1605,8 @@ sub check_bmc_status_with_ipmitool {
my $count = 0;
my $bmc_response = 0;
my $cmd = $pre_cmd." raw 0x3a 0x0a";
# BMC response of " c0" means BMC still running IPL
# BMC response of " 00" means ready to flash
while ($count < $retry) {
$bmc_response = xCAT::Utils->runcmd($cmd, -1);
if ($bmc_response =~ /00/) {
@ -1675,7 +1677,7 @@ sub do_firmware_update {
return -1;
}
#check reset status
unless (check_bmc_status_with_ipmitool($pre_cmd, 5, 12)) {
unless (check_bmc_status_with_ipmitool($pre_cmd, 5, 24)) {
xCAT::SvrUtils::sendmsg ([1,"Timeout to check the bmc status"],
$callback,$sessdata->{node},%allerrornodes);
return -1;
@ -1689,9 +1691,6 @@ sub do_firmware_update {
return -1;
}
# step 4 upgrade firmware
# NOTE(chenglch) some firmware may not stable enough, it can handle the ipmi session
# request, but failed to upgrade, add sleep function as a work around here to avoid of
# error.
$cmd = $pre_cmd." -z 30000 hpm upgrade $hpm_file force";
$output = xCAT::Utils->runcmd($cmd, -1);