mirror of
https://github.com/xcat2/xcat-core.git
synced 2025-06-12 08:10:12 +00:00
More formatting changes for the <or> display
This commit is contained in:
Mark Gurevich
@ -286,7 +286,9 @@ group Attributes:
|
||||
\ **hcp**\ (ppc.hcp, zvm.hcp)
|
||||
|
||||
The hardware control point for this node (HMC, IVM, Frame or CEC). Do not need to set for BPAs and FSPs.
|
||||
|
||||
or
|
||||
|
||||
The hardware control point for this node.
|
||||
|
||||
|
||||
@ -330,11 +332,17 @@ group Attributes:
|
||||
\ **hwtype**\ (ppc.nodetype, zvm.nodetype, mp.nodetype, mic.nodetype)
|
||||
|
||||
The hardware type of the node. Only can be one of fsp, bpa, cec, frame, ivm, hmc and lpar
|
||||
|
||||
or
|
||||
|
||||
The node type. Valid values: cec (Central Electronic Complex), lpar (logical partition), zvm (z/VM host operating system), and vm (virtual machine).
|
||||
|
||||
or
|
||||
|
||||
The hardware type for mp node. Valid values: mm,cmm, blade.
|
||||
|
||||
or
|
||||
|
||||
The hardware type of the mic node. Generally, it is mic.
|
||||
|
||||
|
||||
@ -342,7 +350,9 @@ group Attributes:
|
||||
\ **id**\ (ppc.id, mp.id)
|
||||
|
||||
For LPARs: the LPAR numeric id; for CECs: the cage number; for Frames: the frame number.
|
||||
|
||||
or
|
||||
|
||||
The slot number of this blade in the BladeCenter chassis.
|
||||
|
||||
|
||||
@ -718,11 +728,17 @@ group Attributes:
|
||||
\ **password**\ (ppchcp.password, mpa.password, websrv.password, switches.sshpassword)
|
||||
|
||||
Password of the HMC or IVM. If not filled in, xCAT will look in the passwd table for key=hmc or key=ivm. If not in the passwd table, the default used is abc123 for HMCs and padmin for IVMs.
|
||||
|
||||
or
|
||||
|
||||
Password to use to access the management module. If not specified, the key=blade row in the passwd table is used as the default.
|
||||
|
||||
or
|
||||
|
||||
Password to use to access the web service.
|
||||
|
||||
or
|
||||
|
||||
The remote login password. It can be for ssh or telnet. If it is for telnet, please set protocol to "telnet". If the sshusername is blank, the username, password and protocol will be retrieved from the passwd table with "switch" as the key.
|
||||
|
||||
|
||||
@ -1115,11 +1131,17 @@ group Attributes:
|
||||
\ **username**\ (ppchcp.username, mpa.username, websrv.username, switches.sshusername)
|
||||
|
||||
Userid of the HMC or IVM. If not filled in, xCAT will look in the passwd table for key=hmc or key=ivm. If not in the passwd table, the default used is hscroot for HMCs and padmin for IVMs.
|
||||
|
||||
or
|
||||
|
||||
Userid to use to access the management module.
|
||||
|
||||
or
|
||||
|
||||
Userid to use to access the web service.
|
||||
|
||||
or
|
||||
|
||||
The remote login user name. It can be for ssh or telnet. If it is for telnet, please set protocol to "telnet". If the sshusername is blank, the username, password and protocol will be retrieved from the passwd table with "switch" as the key.
|
||||
|
||||
|
||||
|
||||
@ -292,7 +292,9 @@ node Attributes:
|
||||
\ **hcp**\ (ppc.hcp, zvm.hcp)
|
||||
|
||||
The hardware control point for this node (HMC, IVM, Frame or CEC). Do not need to set for BPAs and FSPs.
|
||||
|
||||
or
|
||||
|
||||
The hardware control point for this node.
|
||||
|
||||
|
||||
@ -342,11 +344,17 @@ node Attributes:
|
||||
\ **hwtype**\ (ppc.nodetype, zvm.nodetype, mp.nodetype, mic.nodetype)
|
||||
|
||||
The hardware type of the node. Only can be one of fsp, bpa, cec, frame, ivm, hmc and lpar
|
||||
|
||||
or
|
||||
|
||||
The node type. Valid values: cec (Central Electronic Complex), lpar (logical partition), zvm (z/VM host operating system), and vm (virtual machine).
|
||||
|
||||
or
|
||||
|
||||
The hardware type for mp node. Valid values: mm,cmm, blade.
|
||||
|
||||
or
|
||||
|
||||
The hardware type of the mic node. Generally, it is mic.
|
||||
|
||||
|
||||
@ -354,7 +362,9 @@ node Attributes:
|
||||
\ **id**\ (ppc.id, mp.id)
|
||||
|
||||
For LPARs: the LPAR numeric id; for CECs: the cage number; for Frames: the frame number.
|
||||
|
||||
or
|
||||
|
||||
The slot number of this blade in the BladeCenter chassis.
|
||||
|
||||
|
||||
@ -724,11 +734,17 @@ node Attributes:
|
||||
\ **password**\ (ppchcp.password, mpa.password, websrv.password, switches.sshpassword)
|
||||
|
||||
Password of the HMC or IVM. If not filled in, xCAT will look in the passwd table for key=hmc or key=ivm. If not in the passwd table, the default used is abc123 for HMCs and padmin for IVMs.
|
||||
|
||||
or
|
||||
|
||||
Password to use to access the management module. If not specified, the key=blade row in the passwd table is used as the default.
|
||||
|
||||
or
|
||||
|
||||
Password to use to access the web service.
|
||||
|
||||
or
|
||||
|
||||
The remote login password. It can be for ssh or telnet. If it is for telnet, please set protocol to "telnet". If the sshusername is blank, the username, password and protocol will be retrieved from the passwd table with "switch" as the key.
|
||||
|
||||
|
||||
@ -1151,11 +1167,17 @@ node Attributes:
|
||||
\ **username**\ (ppchcp.username, mpa.username, websrv.username, switches.sshusername)
|
||||
|
||||
Userid of the HMC or IVM. If not filled in, xCAT will look in the passwd table for key=hmc or key=ivm. If not in the passwd table, the default used is hscroot for HMCs and padmin for IVMs.
|
||||
|
||||
or
|
||||
|
||||
Userid to use to access the management module.
|
||||
|
||||
or
|
||||
|
||||
Userid to use to access the web service.
|
||||
|
||||
or
|
||||
|
||||
The remote login user name. It can be for ssh or telnet. If it is for telnet, please set protocol to "telnet". If the sshusername is blank, the username, password and protocol will be retrieved from the passwd table with "switch" as the key.
|
||||
|
||||
|
||||
|
||||
@ -90,7 +90,9 @@ osimage Attributes:
|
||||
\ **dump**\ (linuximage.dump, nimimage.dump)
|
||||
|
||||
The NFS directory to hold the Linux kernel dump file (vmcore) when the node with this image crashes, its format is "nfs://<nfs_server_ip>/<kdump_path>". If you want to use the node's "xcatmaster" (its SN or MN), <nfs_server_ip> can be left blank. For example, "nfs:///<kdump_path>" means the NFS directory to hold the kernel dump file is on the node's SN, or MN if there's no SN.
|
||||
|
||||
or
|
||||
|
||||
The name of the NIM dump resource.
|
||||
|
||||
|
||||
@ -277,8 +279,10 @@ osimage Attributes:
|
||||
|
||||
\ **partitionfile**\ (linuximage.partitionfile, winimage.partitionfile)
|
||||
|
||||
The path of the configuration file which will be used to partition the disk for the node. For stateful osimages,two types of files are supported: "<partition file absolute path>" which contains a partitioning definition that will be inserted directly into the generated autoinst configuration file and must be formatted for the corresponding OS installer (e.g. kickstart for RedHat, autoyast for SLES, pressed for Ubuntu). "s:<partitioning script absolute path>" which specifies a shell script that will be run from the OS installer configuration file %pre section; the script must write the correct partitioning definition into the file /tmp/partitionfile on the node which will be included into the configuration file during the install process. For statelite osimages, partitionfile should specify "<partition file absolute path>"; see the xCAT Statelite documentation for the xCAT defined format of this configuration file.For Ubuntu, besides "<partition file absolute path>" or "s:<partitioning script absolute path>", the disk name(s) to partition must be specified in traditional, non-devfs format, delimited with space, it can be specified in 2 forms: "d:<the absolute path of the disk name file>" which contains the disk name(s) to partition and "s:d:<the absolute path of the disk script>" which runs in pressed/early_command and writes the disk names into the "/tmp/install_disk" . To support other specific partition methods such as RAID or LVM in Ubuntu, some additional preseed values should be specified, these values can be specified with "c:<the absolute path of the additional pressed config file>" which contains the additional pressed entries in "d-i ..." form and "s:c:<the absolute path of the additional pressed config script>" which runs in pressed/early_command and set the preseed values with "debconf-set". The multiple values should be delimited with comma ","
|
||||
The path of the configuration file which will be used to partition the disk for the node. For stateful osimages,two types of files are supported: "<partition file absolute path>" which contains a partitioning definition that will be inserted directly into the generated autoinst configuration file and must be formatted for the corresponding OS installer (e.g. kickstart for RedHat, autoyast for SLES, pressed for Ubuntu). "s:<partitioning script absolute path>" which specifies a shell script that will be run from the OS installer configuration file %pre section; the script must write the correct partitioning definition into the file /tmp/partitionfile on the node which will be included into the configuration file during the install process. For statelite osimages, partitionfile should specify "<partition file absolute path>"; see the xCAT Statelite documentation for the xCAT defined format of this configuration file.For Ubuntu, besides "<partition file absolute path>" or "s:<partitioning script absolute path>", the disk name(s) to partition must be specified in traditional, non-devfs format, delimited with space, it can be specified in 2 forms: "d:<the absolute path of the disk name file>" which contains the disk name(s) to partition and "s:d:<the absolute path of the disk script>" which runs in pressed/early_command and writes the disk names into the "/tmp/install_disk" . To support other specific partition methods such as RAID or LVM in Ubuntu, some additional preseed values should be specified, these values can be specified with "c:<the absolute path of the additional pressed config file>" which contains the additional pressed entries in "d-i ..." form and "s:c:<the absolute path of the additional pressed config script>" which runs in pressed/early_command and set the preseed values with "debconf-set". The multiple values should be delimited with comma ","
|
||||
|
||||
or
|
||||
|
||||
The path of partition configuration file. Since the partition configuration for bios boot mode and uefi boot mode are different, this configuration file can include both configurations if you need to support both bios and uefi mode. Either way, you must specify the boot mode in the configuration. Example of partition configuration file: [BIOS]xxxxxxx[UEFI]yyyyyyy. To simplify the setting, you also can set installto in partitionfile with section like [INSTALLTO]0:1
|
||||
|
||||
|
||||
@ -394,7 +398,9 @@ osimage Attributes:
|
||||
\ **template**\ (linuximage.template, winimage.template)
|
||||
|
||||
The fully qualified name of the template file that will be used to create the OS installer configuration file for stateful installations (e.g. kickstart for RedHat, autoyast for SLES).
|
||||
|
||||
or
|
||||
|
||||
The fully qualified name of the template file that is used to create the windows unattend.xml file for diskful installation.
|
||||
|
||||
|
||||
@ -408,7 +414,9 @@ osimage Attributes:
|
||||
\ **usercomment**\ (linuximage.comments, nimimage.comments)
|
||||
|
||||
Any user-written notes.
|
||||
|
||||
or
|
||||
|
||||
Any user-provided notes.
|
||||
|
||||
|
||||
|
||||
@ -416,7 +416,7 @@ parentheses, what tables each attribute is stored in.
|
||||
EOS2
|
||||
|
||||
foreach my $a (sort keys %attrlist) {
|
||||
my $d = join("\nor\n", @{$attrlist{$a}->{'descriptions'}});
|
||||
my $d = join("\n\nor\n\n", @{$attrlist{$a}->{'descriptions'}});
|
||||
#$d =~ s/\n/\n\n/sg; # if there are newlines, double them so pod sees a blank line, otherwise pod will ignore them
|
||||
my $t = '(' . join(', ',@{$attrlist{$a}->{'tables'}}) . ')';
|
||||
#print FILE "\nB<$a> - $d\n";
|
||||
|
||||
Reference in New Issue
Block a user