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

rflash for Supermicro Briggs and Boston nodes

Browse Source
This commit is contained in:
Mark Gurevich 2017-07-14 11:21:19 -04:00
parent 92bd65dfad
commit 464ef135d5
4 changed files with 153 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
docs/source/guides/admin-guides/references/man1/rflash.1.rst
View File

@ -11,7 +11,7 @@ Name
****
\ **rflash**\ - Performs Licensed Internal Code (LIC) update support for HMC-attached POWER5 and POWER6 Systems, and POWER7 systems using Direct FSP management. \ **rflash**\ is also able to update firmware for NextScale Fan Power Controllers (FPC).
\ **rflash**\ - Performs Licensed Internal Code (LIC) update support for HMC-attached POWER5 and POWER6 Systems, and POWER7 systems using Direct FSP management. POWER8 and POWER9 systems are also supported. \ **rflash**\ is also able to update firmware for NextScale Fan Power Controllers (FPC).
****************
@ -50,7 +50,7 @@ OpenPOWER BMC specific:
=======================
\ **rflash**\ \ *noderange*\ \ *hpm_file_path*\ [\ **-c | -**\ **-check**\ ] [\ **-**\ **-retry=**\ \ *count*\ ] [\ **-V**\ ]
\ **rflash**\ \ *noderange*\ [\ *hpm_file_path*\ | \ **-d=**\ \ *data_directory] [\ \*\*-c\*\*\ |\ \*\*-**\ **-check\*\*\ ] [\ \*\*-**\ **-retry=\*\*\ \ \*count\*\ ] [\ \*\*-V\*\*\ ]*\
@ -122,7 +122,8 @@ OpenPOWER specific:
===================
The command will update firmware for OpenPOWER BMC when given an OpenPOWER node and the hpm1 formatted file path.
The command will update firmware for OpenPOWER BMC when given an OpenPOWER node and either the hpm formatted file path or path to a data directory.
\ **Note:**\ When using \ **rflash**\ in hierarchical environment, the hpm file or data directory must be accessible from Service Nodes. Shared storage can be used to accomplish that, alternatively the hpm file or contents of the data directory can be copied to Service Nodes.
@ -156,6 +157,12 @@ The command will update firmware for OpenPOWER BMC when given an OpenPOWER node
\ **-d=**\ \ *data_directory*\
Used for Supermicro systems only. Specifies the directory where the \ **pUpdate**\ utility and at least one of BMC or PNOR update files are located. The utility and update files can be downloaded from FixCentral.
\ **-**\ **-activate**\ {\ **concurrent**\ | \ **disruptive**\ }
Must be specified to activate the new Licensed Internal Code. The "disruptive" option will cause the target systems to be recycled. Without this flag, LIC updates will be installed only, not activated.
@ -267,6 +274,16 @@ The command will update firmware for OpenPOWER BMC when given an OpenPOWER node
6. To update the firmware on OpenPOWER Supermicro machine specify the node name and the file path of the data directory containing pUpdate utility and BMC and/or PNOR update files:
.. code-block:: perl
rflash briggs01 -d=/root/supermicro/OP825
****************
\ **Location**\

2
perl-xCAT/xCAT/Usage.pm
View File

@ -340,7 +340,7 @@ my %usage = (
rflash <noderange> [--commit | --recover] [-V|--verbose]
rflash <noderange> [--bpa_acdl]
PPC64LE (using BMC Management) specific:
rflash <noderange> [-c | --check] [--retry=<count>] [-V] <hpm_file>",
rflash <noderange> [-c | --check] [--retry=<count>] [-V] [<hpm_file>|-d=<data_directory>]",
"mkhwconn" =>
"Usage:
mkhwconn [-h|--help]

17
xCAT-client/pods/man1/rflash.1.pod
View File

@ -1,6 +1,6 @@
=head1 Name
B<rflash> - Performs Licensed Internal Code (LIC) update support for HMC-attached POWER5 and POWER6 Systems, and POWER7 systems using Direct FSP management. B<rflash> is also able to update firmware for NextScale Fan Power Controllers (FPC).
B<rflash> - Performs Licensed Internal Code (LIC) update support for HMC-attached POWER5 and POWER6 Systems, and POWER7 systems using Direct FSP management. POWER8 and POWER9 systems are also supported. B<rflash> is also able to update firmware for NextScale Fan Power Controllers (FPC).
=head1 B<Synopsis>
@ -24,7 +24,7 @@ B<rflash> I<noderange> I<http_directory>
=head2 OpenPOWER BMC specific:
B<rflash> I<noderange> I<hpm_file_path> [B<-c>|B<--check>] [B<--retry=>I<count>] [B<-V>]
B<rflash> I<noderange> [I<hpm_file_path> | B<-d=>I<data_directory>] [B<-c>|B<--check>] [B<--retry=>I<count>] [B<-V>]
=head1 B<Description>
@ -38,6 +38,7 @@ The I<noderange> can be an CEC or CEC list, a Lpar or Lpar list and a Frame or F
The command will update firmware for NeXtScale FPC when given an FPC node and the http information needed to access the firmware.
=head2 PPC (with HMC) specific:
The B<rflash> command uses the B<xdsh> command to connect to the HMC controlling the given managed system and perform the updates. Before running B<rflash>, use B<rspconfig> to check if the related HMC ssh is enabled. To enable a HMC ssh connection, use B<rspconfig> command.
@ -80,7 +81,8 @@ The command will update firmware for NeXtScale FPC when given an FPC node and th
=head2 OpenPOWER specific:
The command will update firmware for OpenPOWER BMC when given an OpenPOWER node and the hpm1 formatted file path.
The command will update firmware for OpenPOWER BMC when given an OpenPOWER node and either the hpm formatted file path or path to a data directory.
B<Note:> When using B<rflash> in hierarchical environment, the hpm file or data directory must be accessible from Service Nodes. Shared storage can be used to accomplish that, alternatively the hpm file or contents of the data directory can be copied to Service Nodes.
=head1 B<Options>
@ -102,6 +104,10 @@ Specifies the directory where the packages are located.
Specifies the directory where the raw data from rpm packages for each CEC/Frame are located. The default directory is /tmp. The option is only used in Direct FSP/BPA Management.
=item B<-d=>I<data_directory>
Used for Supermicro systems only. Specifies the directory where the B<pUpdate> utility and at least one of BMC or PNOR update files are located. The utility and update files can be downloaded from FixCentral.
=item B<--activate> {B<concurrent> | B<disruptive>}
Must be specified to activate the new Licensed Internal Code. The "disruptive" option will cause the target systems to be recycled. Without this flag, LIC updates will be installed only, not activated.
@ -167,6 +173,11 @@ Print verbose message to rflash log file (/var/log/xcat/rflash/fs3.log) when upd
rflash fs3 /firmware/8335_810.1543.20151021b_update.hpm -V
=item 6.
To update the firmware on OpenPOWER Supermicro machine specify the node name and the file path of the data directory containing pUpdate utility and BMC and/or PNOR update files:
rflash briggs01 -d=/root/supermicro/OP825
=back
=head1 B<Location>

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

@ -1825,6 +1825,7 @@ sub do_firmware_update {
my $is_firestone = 0;
my $firestone_update_version;
my $htm_update_version;
my $pUpdate_directory;
$ret = get_ipmitool_version(\$ipmitool_ver);
exit $ret if $ret < 0;
@ -1866,12 +1867,6 @@ sub do_firmware_update {
errorcode => 1 });
exit -1;
}
if (($hpm_data_hash{deviceID} ne $sessdata->{device_id}) ||
($hpm_data_hash{productID} ne $sessdata->{prod_id}) ||
($hpm_data_hash{manufactureID} ne $sessdata->{mfg_id})) {
$exit_with_error_func->($sessdata->{node}, $callback,
"The image file doesn't match this machine");
}
my $output;
my $bmc_addr = $sessdata->{ipmisession}->{bmc};
@ -1885,6 +1880,7 @@ sub do_firmware_update {
$hpm_file = xCAT::Utils->full_path($hpm_file, $::cwd);
}
my $rflash_log_file = xCAT::Utils->full_path($sessdata->{node}.".log", RFLASH_LOG_DIR);
# NOTE (chenglch) lanplus should be used for the task of hpm update
# which indicate the bmc support ipmi protocol version 2.0.
@ -1937,6 +1933,121 @@ sub do_firmware_update {
}
}
}
if ($opt =~ /-d=/) {
my ($attribute, $directory_name) = split(/=/, $opt);
if (defined $directory_name) {
# directory was passed in, verify it is valid
if (-d $directory_name) {
# Passed in directory name exists
$pUpdate_directory = $directory_name;
}
else {
$exit_with_error_func->($sessdata->{node}, $callback,
"Can not access data directory $directory_name");
}
}
else {
$exit_with_error_func->($sessdata->{node}, $callback,
"Data directory must be specified.");
}
}
}
# For Supermicro machines such as P9 Boston (9006-22C) or P8 Briggs (8001-22C)
# firmware update is done using pUpdate utility expected to be in the
# specified data directory along with the update files .bin for BMC or .pnor for Host
if ($output =~ /8001-22C|9006-22C/) {
# Verify valid data directory was specified
unless ($pUpdate_directory) {
$exit_with_error_func->($sessdata->{node}, $callback,
"Directory name is required to update Boston or Briggs machines.");
}
# Verify specified directory contains executable pUpdate utility
unless (-x "$pUpdate_directory/pUpdate") {
$exit_with_error_func->($sessdata->{node}, $callback,
"Can not find executable pUpdate utility in data directory $pUpdate_directory.");
}
# Verify there is at least one of update files inside data directory - .bin or .pnor
my @pnor_files = <"$pUpdate_directory/*.pnor">; # Get a list of all .pnor files
my @bmc_files = <"$pUpdate_directory/*.bin">; # Get a list of all .bin files
if (scalar(@pnor_files) > 1) {
# Error if more than one .pnor file in data directory
$exit_with_error_func->($sessdata->{node}, $callback,
"Multiple PNOR update files detected in data directory $pUpdate_directory.");
}
if (scalar(@bmc_files) > 1) {
# Error if more than one .bin file in data directory
$exit_with_error_func->($sessdata->{node}, $callback,
"Multiple BMC update files detected in data directory $pUpdate_directory.");
}
my $pnor_file;
if (scalar(@pnor_files) > 0) {
$pnor_file = $pnor_files[0];
}
my $bmc_file;
if (scalar(@bmc_files) > 0) {
$bmc_file = $bmc_files[0];
}
# At least one update file is needed, .bmc or .pnor
unless ($pnor_file || $bmc_file) {
$exit_with_error_func->($sessdata->{node}, $callback,
"At least one update file (.bin or .pnor) needs to be in data directory $pUpdate_directory.");
}
# All checks are done, run pUpdate utility on each of the update files found in
# the specified data directory
xCAT::SvrUtils::sendmsg("rflash started, Please wait...", $callback, $sessdata->{node});
if ($bmc_file) {
# BMC file was found in data directory, run update with it
my $pUpdate_bmc_cmd = "$pUpdate_directory/pUpdate -f $bmc_file -i lan -h $bmc_addr -u $bmc_userid -p $bmc_password >".$rflash_log_file." 2>&1";
if ($verbose) {
xCAT::SvrUtils::sendmsg([ 0,
"rflashing BMC, see the detail progress :\"tail -f $rflash_log_file\"" ],
$callback, $sessdata->{node});
}
my $output = xCAT::Utils->runcmd($pUpdate_bmc_cmd, -1);
if ($::RUNCMD_RC != 0) {
$exit_with_error_func->($sessdata->{node}, $callback,
"Error running command $pUpdate_bmc_cmd");
}
if ($verbose) {
xCAT::SvrUtils::sendmsg([ 0, "Waiting for BMC to reboot (2 min)..." ], $callback, $sessdata->{node});
}
sleep (120);
}
if ($pnor_file) {
# PNOR file was found in data directory, run update with it
my $pUpdate_pnor_cmd = "$pUpdate_directory/pUpdate -pnor $pnor_file -i lan -h $bmc_addr -u $bmc_userid -p $bmc_password >>".$rflash_log_file." 2>&1";
if ($verbose) {
xCAT::SvrUtils::sendmsg([ 0,
"rflashing PNOR, see the detail progress :\"tail -f $rflash_log_file\"" ],
$callback, $sessdata->{node});
}
my $output = xCAT::Utils->runcmd($pUpdate_pnor_cmd, -1);
if ($::RUNCMD_RC != 0) {
$exit_with_error_func->($sessdata->{node}, $callback,
"Error running command $pUpdate_pnor_cmd");
}
}
$exit_with_success_func->($sessdata->{node}, $callback, "Firmware updated");
}
if (($hpm_data_hash{deviceID} ne $sessdata->{device_id}) ||
($hpm_data_hash{productID} ne $sessdata->{prod_id}) ||
($hpm_data_hash{manufactureID} ne $sessdata->{mfg_id})) {
$exit_with_error_func->($sessdata->{node}, $callback,
"The image file doesn't match this machine");
}
# check for 8335-GTB Firmware above 1610A release. If below, exit
@ -2060,7 +2171,6 @@ RETRY_UPGRADE:
# step 4 upgrade firmware
# For firestone machines if updating from 810 to 820 version or from 820 to 810,
# extra steps are needed. Hanled in "if" block, "else" block is normal update in a single step.
my $rflash_log_file = xCAT::Utils->full_path($sessdata->{node}.".log", RFLASH_LOG_DIR);
if ($is_firestone and
(($firestone_update_version eq "820" and $htm_update_version eq "810") or
($firestone_update_version eq "810" and $htm_update_version eq "820"))
@ -2228,7 +2338,7 @@ sub rflash {
if ($opt =~ /^(-c|--check)$/i) {
$sessdata->{subcommand} = "check";
# support verbose options for ipmitool command
} elsif ($opt !~ /.*\.hpm$/i && $opt !~ /^-V{1,4}$/ && $opt !~ /^--buffersize=/ && $opt !~ /^--retry=/) {
} elsif ($opt !~ /.*\.hpm$/i && $opt !~ /^-V{1,4}$|^--buffersize=|^--retry=|^-d=/) {
$callback->({ error => "The option $opt is not supported",
errorcode => 1 });
return;