V0.15 of the Schema

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13784 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav 2012-09-13 13:15:28 +00:00
parent e786262c56
commit 624fc39bbf

View File

@ -442,7 +442,7 @@ mp => {
},
},
mpa => {
cols => [qw(mpa username password slots urlpath comments disable)],
cols => [qw(mpa username password displayname slots urlpath comments disable)],
keys => [qw(mpa username)],
nodecol => "mpa",
table_desc => 'Contains info about each Management Module and how to access it.',
@ -450,6 +450,7 @@ mpa => {
mpa => 'Hostname of the management module.',
username => 'Userid to use to access the management module. If not specified, the key=blade row in the passwd table is used as the default.',
password => 'Password to use to access the management module. If not specified, the key=blade row in the passwd table is used as the default.',
displayname => 'Alternative name for BladeCenter chassis. Only used by PCM.',
slots => 'The number of available slots in the chassis.',
urlpath => 'URL path for the Chassis web interface. The full URL is built as follows: <hostname>/<urlpath> ',
comments => 'Any user-written notes.',
@ -556,7 +557,7 @@ nodepos => {
},
},
noderes => {
cols => [qw(node servicenode netboot tftpserver tftpdir nfsserver monserver nfsdir installnic primarynic discoverynics cmdinterface xcatmaster current_osimage next_osimage nimserver routenames dhcpinterfaces comments disable)],
cols => [qw(node servicenode netboot tftpserver tftpdir nfsserver monserver nfsdir installnic primarynic discoverynics cmdinterface xcatmaster current_osimage next_osimage nimserver routenames comments disable)],
keys => [qw(node)],
tablespace =>'XCATTBS16K',
table_desc => 'Resources and settings to use when installing nodes.',
@ -573,13 +574,11 @@ noderes => {
primarynic => 'The network adapter on the node that will be used for xCAT management, the primarynic can be set to the network adapter name or the mac address or the keyword "mac" which means that the network interface specified by the mac address in the mac table will be used. Default is eth0.',
discoverynics => 'If specified, force discovery to occur on specific network adapters only, regardless of detected connectivity. Syntax can be simply "eth2,eth3" to restrict discovery to whatever happens to come up as eth2 and eth3, or by driver name such as "bnx2:0,bnx2:1" to specify the first two adapters managed by the bnx2 driver',
cmdinterface => 'Not currently used.',
#defnetname => 'The host (or ip) by which a node should be addressed (i.e. in psh/pscp). By default, nodename is assumed to be equal to this',
xcatmaster => 'The hostname of the xCAT service node (as known by this node). This acts as the default value for nfsserver and tftpserver, if they are not set. If xcatmaster is not set, the node will use whoever responds to its boot request as its master. For the directed bootp case for POWER, it will use the management node if xcatmaster is not set.',
current_osimage => 'Not currently used. The name of the osimage data object that represents the OS image currently deployed on this node.',
next_osimage => 'Not currently used. The name of the osimage data object that represents the OS image that will be installed on the node the next time it is deployed.',
nimserver => 'Not used for now. The NIM server for this node (as known by this node).',
routenames => 'A comma separated list of route names that refer to rows in the routes table. These are the routes that should be defined on this node when it is deployed.',
dhcpinterfaces => 'The network interfaces DHCP server should listen on for the target node.This attribute can be used for management node and service nodes. It will override the values defined in site.dhcpinterfaces. It is a comma-separated list of NICs. If DHCP server handles DHCP requests forwarded from another network, then the .!remote!. string should be added to the list of NICs. e.g., eth0,eth1,!remote!',
comments => 'Any user-written notes.',
disable => "Set to 'yes' or '1' to comment out this row.",
},
@ -788,7 +787,7 @@ ppchcp => {
},
},
servicenode => {
cols => [qw(node nameserver dhcpserver tftpserver nfsserver conserver monserver ldapserver ntpserver ftpserver nimserver ipforward comments disable)],
cols => [qw(node nameserver dhcpserver tftpserver nfsserver conserver monserver ldapserver ntpserver ftpserver nimserver ipforward dhcpinterfaces comments disable)],
keys => [qw(node)],
table_desc => 'List of all Service Nodes and services that will be set up on the Service Node.',
descriptions => {
@ -804,6 +803,7 @@ servicenode => {
ftpserver => 'Do we set up a ftp server on this service node? Not supported on AIX Valid values:yes or 1, no or 0. If yes, configure and start vsftpd. (You must manually install vsftpd on the service nodes before this.) If no or 0, it does not change the current state of the service. xCAT is not using ftp for compute nodes provisioning or any other xCAT features, so this attribute can be set to 0 if the ftp service will not be used for other purposes',
nimserver => 'Not used. Do we set up a NIM server on this service node? Valid values:yes or 1, no or 0. If no or 0, it does not change the current state of the service.',
ipforward => 'Do we set up ip forwarding on this service node? Valid values:yes or 1, no or 0. If no or 0, it does not change the current state of the service.',
dhcpinterfaces => 'The network interfaces DHCP server should listen on for the target node. This attribute can be used for management node and service nodes. If defined, it will override the values defined in site.dhcpinterfaces.',
comments => 'Any user-written notes.',
disable => "Set to 'yes' or '1' to comment out this row.",
@ -1227,11 +1227,12 @@ nics => {
},
},
rack => {
cols => [qw(rackname num height room comments disable)],
cols => [qw(rackname displayname num height room comments disable)],
keys => [qw(rackname)],
table_desc => 'Rack information.',
descriptions => {
rackname => 'The rack name.',
displayname => 'Alternative name for rack. Only used by PCM.',
num => 'The rack number.',
height => 'Number of units which can be stored in the rack.',
room => 'The room in which the rack is located.',
@ -1499,10 +1500,6 @@ my @nodeattrs = (
{attr_name => 'routenames',
tabentry => 'noderes.routenames',
access_tabentry => 'noderes.node=attr:node',
},
{attr_name => 'dhcpinterfaces',
tabentry => 'noderes.dhcpinterfaces',
access_tabentry => 'noderes.node=attr:node',
},
######################
# servicenode table #
@ -1551,6 +1548,10 @@ my @nodeattrs = (
{attr_name => 'setupnim',
tabentry => 'servicenode.nimserver',
access_tabentry => 'servicenode.node=attr:node',
},
{attr_name => 'dhcpinterfaces',
tabentry => 'servicenode.dhcpinterfaces',
access_tabentry => 'servicenode.node=attr:node',
},
######################
# nodetype table #
@ -1940,6 +1941,11 @@ my @nodeattrs = (
only_if => 'nodetype=mm',
tabentry => 'mpa.password',
access_tabentry => 'mpa.mpa=attr:node',
},
{attr_name => 'displayname',
only_if => 'nodetype=mm',
tabentry => 'mpa.displayname',
access_tabentry => 'mpa.mpa=attr:node',
},
{attr_name => 'slots',
only_if => 'nodetype=mm',
@ -2586,6 +2592,10 @@ push(@{$defspec{node}->{'attrs'}}, @nodeattrs);
tabentry => 'rack.rackname',
access_tabentry => 'rack.rackname=attr:rackname',
},
{attr_name => 'displayname',
tabentry => 'rack.displayname',
access_tabentry => 'rack.rackname=attr:rackname',
},
{attr_name => 'num',
tabentry => 'rack.num',
access_tabentry => 'rack.rackname=attr:rackname',