xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-22 03:32:04 +00:00
Code Issues Releases Wiki Activity

Merge pull request #5452 from gurevichmark/rinstall_options3

Browse Source 
Allow any command for runcmd= option
This commit is contained in:
zet809 2018-08-06 13:44:56 +08:00 committed by GitHub
commit c1608c0b79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
docs/source/guides/admin-guides/references/man8/nodeset.8.rst
View File

@ -19,7 +19,7 @@ Name
****************
\ **nodeset**\ \ *noderange*\ [\ **boot**\ | \ **stat**\ [\ **-a**\ ]| \ **offline**\ | \ **runcmd=bmcsetup**\ | \ **osimage**\ [=\ *imagename*\ ] | \ **shell**\ | \ **shutdown**\ ] [\ **-V | -**\ **-verbose**\ ]
\ **nodeset**\ \ *noderange*\ [\ **boot**\ | \ **stat**\ [\ **-a**\ ]| \ **offline**\ | \ **runcmd=**\ \ *command*\ | \ **osimage**\ [=\ *imagename*\ ] | \ **shell**\ | \ **shutdown**\ ] [\ **-V | -**\ **-verbose**\ ]
\ **nodeset**\ \ *noderange*\ \ **osimage**\ [=\ *imagename*\ ] [\ **-**\ **-noupdateinitrd**\ ] [\ **-**\ **-ignorekernelchk**\ ]
@ -113,10 +113,9 @@ A user can supply their own scripts to be run on the mn or on the service node (
\ **runcmd=bmcsetup**\
\ **runcmd=**\ \ *command*\
This instructs the node to boot to the xCAT nbfs environment and proceed to configure BMC
for basic remote access. This causes the IP, netmask, gateway, username, and password to be programmed according to the configuration table.
This instructs the node to boot to the xCAT genesis environment and specified command to be executed.
@ -199,6 +198,16 @@ root directory and the TFTP xCAT subdirectory. /tftpboot and
3. Boot node1 into xCAT genesis environment and execute bmcsetup script. This causes the IP, netmask, gateway, username, and password to be programmed according to the configuration in node object definition.
.. code-block:: perl
rinstall node1 runcmd=bmcsetup
************************
\ **See**\ \ **Also**\

16
docs/source/guides/admin-guides/references/man8/rinstall.8.rst
View File

@ -19,7 +19,7 @@ Name
****************
\ **rinstall**\ \ *noderange*\ [\ **boot**\ | \ **shell**\ | \ **runcmd=bmcsetup**\ ] [\ **-c | -**\ **-console**\ ] [\ **-V | -**\ **-verbose**\ ]
\ **rinstall**\ \ *noderange*\ [\ **boot**\ | \ **shell**\ | \ **runcmd=**\ \ *command*\ ] [\ **-c | -**\ **-console**\ ] [\ **-V | -**\ **-verbose**\ ]
\ **rinstall**\ \ *noderange*\ \ **osimage**\ [=\ *imagename*\ ] [\ **-**\ **-ignorekernelchk**\ ] [\ **-c | -**\ **-console**\ ] [\ **-u | -**\ **-uefimode**\ ] [\ **-V | -**\ **-verbose**\ ]
@ -70,9 +70,9 @@ If \ **-c**\ is specified, it will then run \ **rcons**\ on the node. This is
\ **runcmd=bmcsetup**\
\ **runcmd=**\ \ *command*\
This instructs the node to boot to the xCAT nbfs environment and proceed to configure BMC for basic remote access. This causes the IP, netmask, gateway, username, and password to be programmed according to the configuration table.
This instructs the node to boot to the xCAT genesis environment and specified command to be executed.
@ -150,6 +150,16 @@ If \ **-c**\ is specified, it will then run \ **rcons**\ on the node. This is
4. Boot node1 into xCAT genesis environment and execute bmcsetup script. This causes the IP, netmask, gateway, username, and password to be programmed according to the configuration in node object definition.
.. code-block:: perl
rinstall node1 runcmd=bmcsetup
************************
\ **See**\ \ **Also**\

12
xCAT-client/pods/man8/nodeset.8.pod
View File

@ -4,7 +4,7 @@ B<nodeset> - set the boot state for a noderange
=head1 B<Synopsis>
B<nodeset> I<noderange> [B<boot> | B<stat> [B<-a>]| B<offline> | B<runcmd=bmcsetup> | B<osimage>[=I<imagename>] | B<shell> | B<shutdown>] [B<-V>|B<--verbose>]
B<nodeset> I<noderange> [B<boot> | B<stat> [B<-a>]| B<offline> | B<runcmd=>I<command> | B<osimage>[=I<imagename>] | B<shell> | B<shutdown>] [B<-V>|B<--verbose>]
B<nodeset> I<noderange> B<osimage>[=I<imagename>] [B<--noupdateinitrd>] [B<--ignorekernelchk>]
@ -78,10 +78,9 @@ If you would like to run a task after deployment, you can define that task with
Display the current boot loader config file description for the nodes requested. When B<disjointdhcps> is set, using B<-a> to display them on all available service nodes.
=item B<runcmd=bmcsetup>
=item B<runcmd=>I<command>
This instructs the node to boot to the xCAT nbfs environment and proceed to configure BMC
for basic remote access. This causes the IP, netmask, gateway, username, and password to be programmed according to the configuration table.
This instructs the node to boot to the xCAT genesis environment and specified command to be executed.
=item B<shell>
@ -138,6 +137,11 @@ To run http://$master/image.tgz after deployment:
nodeset $node runimage=http://$MASTER/image.tgz
=item 3.
Boot node1 into xCAT genesis environment and execute bmcsetup script. This causes the IP, netmask, gateway, username, and password to be programmed according to the configuration in node object definition.
rinstall node1 runcmd=bmcsetup
=back
=head1 B<See> B<Also>

11
xCAT-client/pods/man8/rinstall.8.pod
View File

@ -4,7 +4,7 @@ B<rinstall> - Begin OS provision on a noderange
=head1 B<Synopsis>
B<rinstall> I<noderange> [B<boot> | B<shell> | B<runcmd=bmcsetup>] [B<-c>|B<--console>] [B<-V>|B<--verbose>]
B<rinstall> I<noderange> [B<boot> | B<shell> | B<runcmd=>I<command>] [B<-c>|B<--console>] [B<-V>|B<--verbose>]
B<rinstall> I<noderange> B<osimage>[=I<imagename>] [B<--ignorekernelchk>] [B<-c>|B<--console>] [B<-u>|B<--uefimode>] [B<-V>|B<--verbose>]
@ -40,9 +40,9 @@ Skip the kernel version checking when injecting drivers from osimage.driverupdat
If you would like to run a task after deployment, you can define that task with this attribute.
=item B<runcmd=bmcsetup>
=item B<runcmd=>I<command>
This instructs the node to boot to the xCAT nbfs environment and proceed to configure BMC for basic remote access. This causes the IP, netmask, gateway, username, and password to be programmed according to the configuration table.
This instructs the node to boot to the xCAT genesis environment and specified command to be executed.
=item B<shell>
@ -91,6 +91,11 @@ Provision node1 and start a console to monitor the process.
rinstall node1 -c
=item 4.
Boot node1 into xCAT genesis environment and execute bmcsetup script. This causes the IP, netmask, gateway, username, and password to be programmed according to the configuration in node object definition.
rinstall node1 runcmd=bmcsetup
=back
=head1 B<See> B<Also>

4
xCAT-server/lib/xcat/plugins/rinstall.pm
View File

@ -113,7 +113,7 @@ sub rinstall {
$OSIMAGE = $1; # osimage was specified
xCAT::MsgUtils->message("I", $rsp, $callback);
}
elsif ($state =~ /^boot$|^shell$|^osimage$|^runcmd=bmcsetup$|^runimage=/) {
elsif ($state =~ /^boot$|^shell$|^osimage$|^runcmd=|^runimage=/) {
# the rest are valid actions, just pass to nodeset
$STATES=$state;
}
@ -584,7 +584,7 @@ sub usage {
my $callback = shift;
my $rsp = {};
$rsp->{data}->[0] = "Usage:";
$rsp->{data}->[1] = " $command <noderange> [boot | shell | runcmd=bmcsetup] [-c|--console] [-u|--uefimode] [-V|--verbose]";
$rsp->{data}->[1] = " $command <noderange> [boot | shell | runcmd=<command>] [-c|--console] [-u|--uefimode] [-V|--verbose]";
$rsp->{data}->[2] = " $command <noderange> osimage[=<imagename>] [--ignorekernelchk] [-c|--console] [-u|--uefimode] [-V|--verbose]";
$rsp->{data}->[3] = " $command <noderange> runimage=<task>";
$rsp->{data}->[4] = " $command [-h|--help|-v|--version]";