arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove nodetype condition on several node definition attributes.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2249 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
nott 2008-09-28 16:37:53 +00:00
parent b968fbd914
commit b38b5c1f8a
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
perl-xCAT/xCAT/Schema.pm
View File

@ -324,7 +324,7 @@ nodetype => {
table_desc => 'A few hardware and software characteristics of the nodes.',
descriptions => {
node => 'The node name or group name.',
os => 'The operating system deployed on this node. Valid values: rh*, centos*, fedora*, sles* (where * is the version #).',
os => 'The operating system deployed on this node. Valid values: AIX, rh*, centos*, fedora*, sles* (where * is the version #).',
arch => 'The hardware architecture of this node. Valid values: x86_64, ppc64, x86, ia64.',
profile => 'Either the name of an xCAT osimage definition or a pointer to a kickstart or autoyast template to use for OS deployment of this node.',
nodetype => 'A comma-delimited list of characteristics of this node. Valid values: blade, vm (virtual machine), lpar, osi (OS image), hmc, fsp, ivm, bpa, mm, rsa, switch.',
@ -637,12 +637,10 @@ my @nodeattrs = (
access_tabentry => 'noderes.node=attr:node',
},
{attr_name => 'tftpserver',
only_if => 'nodetype=osi',
tabentry => 'noderes.tftpserver',
access_tabentry => 'noderes.node=attr:node',
},
{attr_name => 'nfsserver',
only_if => 'nodetype=osi',
tabentry => 'noderes.nfsserver',
access_tabentry => 'noderes.node=attr:node',
},
@ -651,12 +649,10 @@ my @nodeattrs = (
# to this attribute.
###
{attr_name => 'nfsdir',
only_if => 'nodetype=osi',
tabentry => 'noderes.nfsdir',
access_tabentry => 'noderes.node=attr:node',
},
{attr_name => 'monserver',
only_if => 'nodetype=osi',
tabentry => 'noderes.monserver',
access_tabentry => 'noderes.node=attr:node',
},
@ -679,17 +675,14 @@ my @nodeattrs = (
# access_tabentry => 'noderes.node=attr:node',
# },
{attr_name => 'primarynic',
only_if => 'nodetype=osi',
tabentry => 'noderes.primarynic',
access_tabentry => 'noderes.node=attr:node',
},
{attr_name => 'installnic',
only_if => 'nodetype=osi',
tabentry => 'noderes.installnic',
access_tabentry => 'noderes.node=attr:node',
},
{attr_name => 'netboot',
only_if => 'nodetype=osi',
tabentry => 'noderes.netboot',
access_tabentry => 'noderes.node=attr:node',
},
@ -741,14 +734,12 @@ my @nodeattrs = (
access_tabentry => 'nodetype.node=attr:node',
},
{attr_name => 'os',
# only_if => 'nodetype=osi',
tabentry => 'nodetype.os',
access_tabentry => 'nodetype.node=attr:node',
},
# TODO: need to decide what to do with the profile attr once the osimage
# stuff is implemented. May want to move this to the osimage table.
{attr_name => 'profile',
# only_if => 'nodetype=osi',
tabentry => 'nodetype.profile',
access_tabentry => 'nodetype.node=attr:node',
},
@ -756,22 +747,18 @@ my @nodeattrs = (
# iscsi table #
####################
{attr_name => 'iscsiserver',
only_if => 'nodetype=osi',
tabentry => 'iscsi.server',
access_tabentry => 'iscsi.node=attr:node',
},
{attr_name => 'iscsitarget',
only_if => 'nodetype=osi',
tabentry => 'iscsi.target',
access_tabentry => 'iscsi.node=attr:node',
},
{attr_name => 'iscsiuserid',
only_if => 'nodetype=osi',
tabentry => 'iscsi.userid',
access_tabentry => 'iscsi.node=attr:node',
},
{attr_name => 'iscsipassword',
only_if => 'nodetype=osi',
tabentry => 'iscsi.passwd',
access_tabentry => 'iscsi.node=attr:node',
},