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

Merge pull request #5105 from xcat2/master

Browse Source 
Merge master to 2.14 for 2.14 release(1)
This commit is contained in:
zet809
2018-04-13 17:25:26 +08:00
committed by GitHub
parent bd8cf9b430 706e0bbec7
commit 3c96f72f2a
10 changed files with 70 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_defined.rst
+13
View File
@@ -101,6 +101,14 @@ The BMC IP address is obtained by the open range dhcp server and the plan in thi
chdef cn01 chain="runcmd=bmcsetup"
#. **[Optional]** More operation plan to do after hardware disocvery is done, ``ondiscover`` option can be used.
For example, configure console, copy SSH key for **OpenBMC**, then disable ``powersupplyredundancy`` ::
chdef cn01 -p chain="ondiscover=makegocons|rspconfig:sshcfg|rspconfig:powersupplyredundancy=disabled"
**Note**: ``|`` is used to split commands, and ``:`` is used to split command with its option.
#. Set the target `osimage` into the chain table to automatically provision the operating system after the node discovery is complete. ::
chdef cn01 -p chain="osimage=<osimage_name>"
@@ -113,6 +121,11 @@ The BMC IP address is obtained by the open range dhcp server and the plan in thi
chdef cn01 bmc=50.0.101.1
**[Optional]** If more configuration planed to be done on BMC, the following command is also needed. ::
chdef cn01 bmcvlantag=<vlanid> # tag VLAN ID for BMC
chdef cn01 bmcusername=<desired_username>
chdef cn01 bmcpassword=<desired_password>
#. Add the compute node IP information to ``/etc/hosts``: ::
docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_dhcp.rst
+8
View File
@@ -85,6 +85,14 @@ The BMC IP address is obtained by the open range dhcp server and the plan is to
chdef cn01 chain="runcmd=bmcsetup"
#. **[Optional]** More operation plan to do after hardware disocvery is done, ``ondiscover`` option can be used.
For example, configure console, copy SSH key for **OpenBMC**, then disable ``powersupplyredundancy`` ::
chdef cn01 -p chain="ondiscover=makegocons|rspconfig:sshcfg|rspconfig:powersupplyredundancy=disabled"
**Note**: ``|`` is used to split commands, and ``:`` is used to split command with its option.
#. Set the target `osimage` into the chain table to automatically provision the operating system after the node discovery is complete. ::
chdef cn01 -p chain="osimage=<osimage_name>"
docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/seq_discovery.rst
+14
View File
@@ -18,10 +18,24 @@ Predefine a group of nodes with desired IP address for host and IP address for F
nodeadd cn1 groups=powerLE,all
chdef cn1 mgt=ipmi cons=ipmi ip=10.0.101.1 bmc=50.0.101.1 netboot=petitboot installnic=mac primarynic=mac
**[Optional]** If more configuration planed to be done on BMC, the following command is also needed. ::
chdef cn1 bmcvlantag=<vlanid> # tag VLAN ID for BMC
chdef cn1 bmcusername=<desired_username>
chdef cn1 bmcpassword=<desired_password>
In order to do BMC configuration during the discovery process, set ``runcmd=bmcsetup``. ::
chdef cn1 chain="runcmd=bmcsetup"
**[Optional]** More operation plan to do after hardware disocvery is done, ``ondiscover`` option can be used.
For example, configure console, copy SSH key for **OpenBMC**, then disable ``powersupplyredundancy`` ::
chdef cn01 -p chain="ondiscover=makegocons|rspconfig:sshcfg|rspconfig:powersupplyredundancy=disabled"
**Note**: ``|`` is used to split commands, and ``:`` is used to split command with its option.
Set the target `osimage` into the chain table to automatically provision the operating system after the node discovery is complete. ::
chdef cn1 -p chain="osimage=<osimage_name>"
docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/switch_discovery.rst
+15
View File
@@ -54,10 +54,25 @@ After switches are defined, the server node can be predefined with the following
chdef cn1 mgt=ipmi cons=ipmi ip=10.0.101.1 bmc=50.0.101.1 netboot=petitboot installnic=mac primarynic=mac
chdef cn1 switch=switch1 switchport=0
**[Optional]** If more configuration planed to be done on BMC, the following command is also needed. ::
chdef cn1 bmcvlantag=<vlanid> # tag VLAN ID for BMC
chdef cn1 bmcusername=<desired_username>
chdef cn1 bmcpassword=<desired_password>
In order to do BMC configuration during the discovery process, set ``runcmd=bmcsetup``. ::
chdef cn1 chain="runcmd=bmcsetup"
**[Optional]** More operation plan to do after hardware disocvery is done, ``ondiscover`` option can be used.
For example, configure console, copy SSH key for **OpenBMC**, then disable ``powersupplyredundancy`` ::
chdef cn01 -p chain="ondiscover=makegocons|rspconfig:sshcfg|rspconfig:powersupplyredundancy=disabled"
**Note**: ``|`` is used to split commands, and ``:`` is used to split command with its option.
Set the target `osimage` into the chain table to automatically provision the operating system after the node discovery is complete. ::
chdef cn1 -p chain="osimage=<osimage_name>"
docs/source/guides/admin-guides/references/man1/rvitals.1.rst
+1 -1
View File
@@ -67,7 +67,7 @@ OpenPOWER (OpenBMC) specific:
=============================
\ **rvitals**\ \ *noderange*\ [\ **temp | voltage | wattage | fanspeed | power | leds | altitude | all**\ ]
\ **rvitals**\ \ *noderange*\ [\ **temp | voltage | wattage | fanspeed | power | leds | altitude | all**\ ] [\ **-V**\ | \ **-**\ **-verbose**\ ]
xCAT-client/pods/man1/rvitals.1.pod
+1 -1
View File
@@ -32,7 +32,7 @@ B<rvitals> I<noderange> [B<temp>|B<voltage>|B<wattage>|B<fanspeed>|B<power>|B<le
=head2 OpenPOWER (OpenBMC) specific:
B<rvitals> I<noderange> [B<temp>|B<voltage>|B<wattage>|B<fanspeed>|B<power>|B<leds>|B<altitude>|B<all>]
B<rvitals> I<noderange> [B<temp>|B<voltage>|B<wattage>|B<fanspeed>|B<power>|B<leds>|B<altitude>|B<all>] [B<-V>| B<--verbose>]
=head1 B<Description>
xCAT-openbmc-py/lib/python/agent/hwctl/executor/openbmc_bmcconfig.py
+10 -10
View File
@@ -386,13 +386,13 @@ rmdir \"/tmp/$userid\" \n")
obmc.set_apis_values(key, value)
except SelfServerException as e:
return self.callback.error(e.message, node)
except SelfClientException:
except SelfClientException as e:
if e.code == 404:
return self.callback.error('404 Not Found - Requested endpoint does not exist or may \
indicate function is not supported on this OpenBMC firmware.', node)
return self.callback.error('404 Not Found - Requested endpoint does not exist or may ' \
'indicate function is not supported on this OpenBMC firmware.', node)
if e.code == 403:
return self.callback.error('403 Forbidden - Requested endpoint does not exist or may \
indicate function is not yet supported by OpenBMC firmware.', node)
return self.callback.error('403 Forbidden - Requested endpoint does not exist or may ' \
'indicate function is not yet supported by OpenBMC firmware.', node)
return self.callback.error(e.message, node)
self.callback.info("%s: BMC Setting %s..." % (node, openbmc.RSPCONFIG_APIS[key]['display_name']))
@@ -407,13 +407,13 @@ rmdir \"/tmp/$userid\" \n")
except SelfServerException as e:
return self.callback.error(e.message, node)
except SelfClientException:
except SelfClientException as e:
if e.code == 404:
return self.callback.error('404 Not Found - Requested endpoint does not exist or may \
indicate function is not supported on this OpenBMC firmware.', node)
return self.callback.error('404 Not Found - Requested endpoint does not exist or may ' \
'indicate function is not supported on this OpenBMC firmware.', node)
if e.code == 403:
return self.callback.error('403 Forbidden - Requested endpoint does not exist or may \
indicate function is not yet supported by OpenBMC firmware.', node)
return self.callback.error('403 Forbidden - Requested endpoint does not exist or may ' \
'indicate function is not yet supported by OpenBMC firmware.', node)
return self.callback.error(e.message, node)
if isinstance(value, dict):
xCAT-server/lib/xcat/plugins/updatenode.pm
+1
View File
@@ -1833,6 +1833,7 @@ sub updatenodesyncfiles
{
command => ["xdcp"],
node => $syncfile_node{$synclist},
username => $request->{username},
arg => $args,
env => $env
},
xCAT-server/lib/xcat/plugins/xdsh.pm
+6 -4
View File
@@ -639,13 +639,18 @@ sub process_servicenodes_xdcp
$addreq->{'_xcatdest'} = $::mnname;
$addreq->{node} = \@sn;
$addreq->{noderange} = \@sn;
$addreq->{forceroot}->[0] = 1;
# check input request for --nodestatus
my $args = $req->{arg}; # argument
if (grep(/^--nodestatus$/, @$args)) {
push(@{ $addreq->{arg} }, "--nodestatus"); # return nodestatus
}
if (defined($req->{username}) && ($req->{username}->[0] ne "root")) {
# Using `root` when sync temporary files to `site.SNsyncfiledir` (default: /var/xcat/syncfiles)
push(@{ $addreq->{arg} }, "-l");
push(@{ $addreq->{arg} }, "root");
}
push(@{ $addreq->{arg} }, "-v");
push(@{ $addreq->{arg} }, "-s");
push(@{ $addreq->{arg} }, "-F");
@@ -1216,9 +1221,6 @@ sub process_request
$ENV{DSH_FROM_USERID} = $request->{username}->[0];
}
}
if ($request->{forceroot}) {
$ENV{DSH_FROM_USERID} = 'root';
}
if ($command eq "xdsh")
{
xdsh($nodes, $args, $callback, $command, $request->{noderange}->[0]);
xCAT-test/autotest/testcase/rbeacon/cases0
+1 -1
View File
@@ -13,7 +13,7 @@ os:Linux
hcp:openbmc
cmd:rbeacon $$CN stat
check:rc==0
check:output=~$$CN\s*:\s*Front:Off Rear:Off|Front:On Rear:On|Front:Off Rear:On|Front:On Rear:Off
check:output=~$$CN\s*:\s*Front:Off Rear:Off|Front:On Rear:On|Front:Off Rear:On|Front:On Rear:Off|Front:Blink Rear:Blink
end
start:rbeacon_help