From 6ebee05df54b8207338b12257a8c8112c3672071 Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Tue, 12 Nov 2019 15:20:00 -0500 Subject: [PATCH 1/2] OpenBMC Thermal Mode {Perl] --- .../admin-guides/references/man1/rspconfig.1.rst | 10 ++++++++++ perl-xCAT/xCAT/Usage.pm | 2 ++ xCAT-client/pods/man1/rspconfig.1.pod | 8 ++++++++ xCAT-server/lib/xcat/plugins/openbmc.pm | 15 +++++++++++++++ 4 files changed, 35 insertions(+) diff --git a/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst b/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst index d85e1eb50..a783d13aa 100644 --- a/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst @@ -83,6 +83,10 @@ OpenBMC specific: \ **rspconfig**\ \ *noderange*\ \ **sshcfg**\ +\ **rspconfig**\ \ *noderange*\ \ **thermalmode**\ + +\ **rspconfig**\ \ *noderange*\ \ **thermalmode={default|custom|heavy_io|max_base_fan_floor}**\ + \ **rspconfig**\ \ *noderange*\ \ **timesyncmethod**\ \ **rspconfig**\ \ *noderange*\ \ **timesyncmethod={manual|ntp}**\ @@ -521,6 +525,12 @@ OPTIONS +\ **thermalmode**\ + + Display or set the thermal mode of the system to a setting, depending on your system, adapter, and cable type. After a factory reset of the system, the thermal mode setting is lost and must be reapplied. To choose the correct setting for your system, see http://blaze.aus.stglabs.ibm.com/kc20A-cur/POWER9/p9ei3/p9ei3_thermal_mode.htm [OpenBMC] + + + \ **timesyncmethod**\ Set the method for time synchronization on the BMC. [OpenBMC] diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm index d40c13600..3b3b60d06 100755 --- a/perl-xCAT/xCAT/Usage.pm +++ b/perl-xCAT/xCAT/Usage.pm @@ -193,6 +193,8 @@ my %usage = ( rspconfig timesyncmethod={ntp|manual} rspconfig bootmode rspconfig bootmode={safe|regular|setup} + rspconfig thermalmode + rspconfig thermalmode={default|custom|heavy_io|max_base_fan_floor} rspconfig autoreboot rspconfig autoreboot={0|1} ", diff --git a/xCAT-client/pods/man1/rspconfig.1.pod b/xCAT-client/pods/man1/rspconfig.1.pod index b4cd8b4d3..c9c632d42 100644 --- a/xCAT-client/pods/man1/rspconfig.1.pod +++ b/xCAT-client/pods/man1/rspconfig.1.pod @@ -60,6 +60,10 @@ B I B B I B +B I B + +B I B + B I B B I B @@ -402,6 +406,10 @@ B<-d> will download a single dump or all generated dumps from the BMC to /var/lo =back +=item B + +Display or set the thermal mode of the system to a setting, depending on your system, adapter, and cable type. After a factory reset of the system, the thermal mode setting is lost and must be reapplied. To choose the correct setting for your system, see http://blaze.aus.stglabs.ibm.com/kc20A-cur/POWER9/p9ei3/p9ei3_thermal_mode.htm [OpenBMC] + =item B Set the method for time synchronization on the BMC. [OpenBMC] diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm index d406cbed9..70afac5df 100644 --- a/xCAT-server/lib/xcat/plugins/openbmc.pm +++ b/xCAT-server/lib/xcat/plugins/openbmc.pm @@ -676,6 +676,21 @@ my %api_config_info = ( manual => "xyz.openbmc_project.Time.Synchronization.Method.Manual", }, }, + RSPCONFIG_THERMAL_MODE => { + command => "rspconfig", + url => "/control/thermal/0", + attr_url => "Current", + display_name => "BMC ThermalMode", + instruct_msg => "", + type => "attribute", + subcommand => "thermalmode", + attr_value => { + default => "DEFAULT", + custom => "CUSTOM", + heavy_io => "HEAVY_IO", + max_base_fan_floor => "MAX_BASE_FAN_FLOOR", + }, + }, ); $::RESPONSE_OK = "200 OK"; From 12db3ad425c2ecb9883c4b3d70e76d3763f6223f Mon Sep 17 00:00:00 2001 From: Mark Gurevich Date: Wed, 13 Nov 2019 09:45:53 -0500 Subject: [PATCH 2/2] Update URL for external link --- docs/source/guides/admin-guides/references/man1/rspconfig.1.rst | 2 +- xCAT-client/pods/man1/rspconfig.1.pod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst b/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst index a783d13aa..70deaa8c0 100644 --- a/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst +++ b/docs/source/guides/admin-guides/references/man1/rspconfig.1.rst @@ -527,7 +527,7 @@ OPTIONS \ **thermalmode**\ - Display or set the thermal mode of the system to a setting, depending on your system, adapter, and cable type. After a factory reset of the system, the thermal mode setting is lost and must be reapplied. To choose the correct setting for your system, see http://blaze.aus.stglabs.ibm.com/kc20A-cur/POWER9/p9ei3/p9ei3_thermal_mode.htm [OpenBMC] + Display or set the thermal mode of the system to a setting, depending on your system, adapter, and cable type. After a factory reset of the system, the thermal mode setting is lost and must be reapplied. To choose the correct setting for your system, see https://www.ibm.com/support/knowledgecenter/POWER9/p9ei3/p9ei3_thermal_mode.htm [OpenBMC] diff --git a/xCAT-client/pods/man1/rspconfig.1.pod b/xCAT-client/pods/man1/rspconfig.1.pod index c9c632d42..0087291bf 100644 --- a/xCAT-client/pods/man1/rspconfig.1.pod +++ b/xCAT-client/pods/man1/rspconfig.1.pod @@ -408,7 +408,7 @@ B<-d> will download a single dump or all generated dumps from the BMC to /var/lo =item B -Display or set the thermal mode of the system to a setting, depending on your system, adapter, and cable type. After a factory reset of the system, the thermal mode setting is lost and must be reapplied. To choose the correct setting for your system, see http://blaze.aus.stglabs.ibm.com/kc20A-cur/POWER9/p9ei3/p9ei3_thermal_mode.htm [OpenBMC] +Display or set the thermal mode of the system to a setting, depending on your system, adapter, and cable type. After a factory reset of the system, the thermal mode setting is lost and must be reapplied. To choose the correct setting for your system, see https://www.ibm.com/support/knowledgecenter/POWER9/p9ei3/p9ei3_thermal_mode.htm [OpenBMC] =item B