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

Add site attribute descriptions to lsdef output

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2950 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
nott
2009-03-20 18:46:11 +00:00
parent 9878c42f6e
commit 260d232153
3 changed files with 76 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mkAIXdeps
View File

@@ -3,10 +3,15 @@
# This script packages the AIX RPM dependencies
# - it should be run in the ../xcat/xcat-core/trunk directory
# - it puts everything in a aix-dep-snap subdirectory
#
# to upload deps gz file to FRS SourceForge location
# scp dep-aix-2.2-snap*.tar.gz nott@web.sourceforge.net:uploads/
BLDTOP=`pwd`
RPMDIR=$BLDTOP/aix-dep-snap
VER=`cat $BLDTOP/Version`
DATE=`date +"%Y%m%d%H%M"`
SNAP="snap$DATE"
if [ -d $RPMDIR ]
then
@@ -33,6 +38,9 @@ echo "# xCAT on AIX - prerequisite install script" > $RPMDIR/instoss
cp /opt/freeware/src/packages/RPMS/ppc/perl-DBI-1.55-1.aix5.3.ppc.rpm $RPMDIR/
echo "rpm -Uvh perl-DBI-1.55-1.aix5.3.ppc.rpm" >> $RPMDIR/instoss
cp /opt/freeware/src/packages/RPMS/ppc/bash-3.2-1.aix5.2.ppc.rpm $RPMDIR/
echo "rpm -Uvh bash-3.2-1.aix5.2.ppc.rpm" >> $RPMDIR/instoss
cp /opt/freeware/src/packages/RPMS/ppc/perl-DBD-SQLite-1.13-1.aix5.3.ppc.rpm $RPMDIR/
echo "rpm -Uvh perl-DBD-SQLite-1.13-1.aix5.3.ppc.rpm" >> $RPMDIR/instoss
@@ -75,6 +83,18 @@ echo "rpm -Uvh openslp-1.2.1-1.aix5.3.ppc.rpm" >> $RPMDIR/instoss
cp /opt/freeware/src/packages/RPMS/ppc/perl-Crypt-SSLeay-0.57-1.aix5.3.ppc.rpm $RPMDIR/
echo "rpm -Uvh perl-Crypt-SSLeay-0.57-1.aix5.3.ppc.rpm" >> $RPMDIR/instoss
cp /opt/freeware/src/packages/RPMS/ppc/perl-Net-Telnet-3.03-1.2.aix5.3.ppc.rpm $RPMDIR/
echo "rpm -Uvh perl-Net-Telnet-3.03-1.2.aix5.3.ppc.rpm" >> $RPMDIR/instoss
cp /opt/freeware/src/packages/RPMS/ppc/net-snmp-5.4.2.1-1.aix5.3.ppc.rpm $RPMDIR/
echo "rpm -Uvh net-snmp-5.4.2.1-1.aix5.3.ppc.rpm" >> $RPMDIR/instoss
cp /opt/freeware/src/packages/RPMS/ppc/net-snmp-devel-5.4.2.1-1.aix5.3.ppc.rpm $RPMDIR/
echo "rpm -Uvh net-snmp-devel-5.4.2.1-1.aix5.3.ppc.rpm" >> $RPMDIR/instoss
cp /opt/freeware/src/packages/RPMS/ppc/net-snmp-perl-5.4.2.1-1.aix5.3.ppc.rpm $RPMDIR/
echo "rpm -Uvh net-snmp-perl-5.4.2.1-1.aix5.3.ppc.rpm" >> $RPMDIR/instoss
# get the OSS README file
cp ./../../../xcat-dep/trunk/AIX/README $RPMDIR/
@@ -91,8 +111,8 @@ echo "instoss" >> $RPMDIR/flist
echo "xCATaixSN.bnd" >> $RPMDIR/flist
echo "xCATaixSSH.bnd" >> $RPMDIR/flist
echo "xCATaixSSL.bnd" >> $RPMDIR/flist
tar -cvf $RPMDIR/dep-aix-$VER.tar -L $RPMDIR/flist
gzip $RPMDIR/dep-aix-$VER.tar
tar -cvf $RPMDIR/dep-aix-$VER-$SNAP.tar -L $RPMDIR/flist
gzip $RPMDIR/dep-aix-$VER-$SNAP.tar
# make a second tar.gz for mysql packages
cp /opt/freeware/src/packages/RPMS/ppc/perl-DBD-mysql-4.007-1.aix5.3.ppc.rpm $RPMDIR/
@@ -106,7 +126,7 @@ echo "xcat-mysql-5.0-1.aix5.3.ppc.rpm" >> $RPMDIR/flist2
chmod +x $RPMDIR/instmysql
echo "instmysql" >> $RPMDIR/flist2
echo "README" >> $RPMDIR/flist2
tar -cvf $RPMDIR/xcat-mysql-$VER.tar -L $RPMDIR/flist2
gzip $RPMDIR/xcat-mysql-$VER.tar
tar -cvf $RPMDIR/xcat-mysql-$VER-$SNAP.tar -L $RPMDIR/flist2
gzip $RPMDIR/xcat-mysql-$VER-$SNAP.tar
exit 0;

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

@@ -509,41 +509,41 @@ servicenode => {
site => {
cols => [qw(key value comments disable)],
keys => [qw(key)],
table_desc => 'Global settings for the whole cluster. This table is different from the other tables in that each attribute is just named in the key column, rather than having a separate column for each attribute.',
table_desc => "Global settings for the whole cluster. This table is different from the \nother tables in that each attribute is just named in the key column, rather \nthan having a separate column for each attribute. The following is a list of \nthe attributes currently used by xCAT.\n",
descriptions => {
key => "Name of the attribute. Valid values:\n".
" master (xCAT management node)\n".
" xcatconfdir (default /etc/xcat)\n".
" domain (DNS domain name used for the cluster)\n".
" installdir (the local directory name used to hold the node deployment pkgs)\n".
" installloc (location to mount the installdir from in format hostname:/path)\n".
" sharedtftp (set to no/0 if xCAT should not assume /tftpboot is mounted on all service nodes). Default is 1.\n".
" xcatdport (port used by xcatd daemon for client/server communication)\n".
" xcatiport (port used by xcatd to receive install status updates from nodes)\n".
" timezone (e.g. America/New_York)\n".
" nameservers (comma delimited list of DNS servers for the cluster - often the mgmt node)\n".
" ntpservers (comma delimited list of NTP servers for the cluster - often the mgmt node)\n".
" useSSHonAIX (yes/1 or no/0). If yes, ssh/scp will be setup and used. If no, rsh/rcp will be setup and used on AIX.\n".
" blademaxp (max # of processes for blade hw ctrl)\n".
" ppcmaxp (max # of processes for PPC hw ctrl)\n".
" ipmimaxp (max # of processes for ipmi hw ctrl)\n".
" ipmitimeout (the timeout to use when communicating with BMCs)\n".
" ipmiretries (the # of retries to use when communicating with BMCs)\n".
" ipmisdrcache\n".
" iscsidir (the path to put the iscsi disks in on the mgmt node)\n".
" xcatservers (Deprecated! Will be replaced by the servicenode table. List service nodes)\n".
" svloglocal (syslog on the service node does not get forwarded to the mgmt node - default is 0)\n".
" consoleondemand (when set to 'yes', it connects and creates the console output only when the user opens the console)\n".
" dhcpinterfaces (network interfaces DHCP should listen on. If same for all nodes, use simple comma-separated list of NICs. Also support: mn|eth1,eth2;service|bond0;compute|eth0)\n".
" forwarders (DNS servers at your site that can provide names outside of the cluster)\n".
" genpasswords (automatically generate random passwords for BMCs when configuring them)\n".
" defserialport (default serial port - currently only used by mknb)\n".
" defserialspeed (default serial speed - currently only used by mknb)\n".
" defserialflow (default serial flow - currently only used by mknb)\n".
" ppctimeout (the timeout, in milliseconds, to use when communicating with PPC hw)\n".
" maxssh (max # of SSH connections for hw ctrl purposes to PPC hw)\n".
" ppcretry (max # of PPC hw connection attempts before failing)\n".
" fsptimeout (the timeout, in milliseconds, to use when communicating with FSPs)\n",
key => "Name of the attribute. - (Description)\n".
" master - (xCAT management node)\n\n".
" xcatconfdir - (default /etc/xcat)\n\n".
" domain - (DNS domain name used for the cluster)\n\n".
" installdir - (the local directory name used to hold the node deployment pkgs)\n\n".
" installloc - (location to mount the installdir from in format hostname:/path)\n\n".
" sharedtftp - (set to no/0 if xCAT should not assume /tftpboot is mounted on all service nodes. Default is 1.)\n\n".
" xcatdport - (port used by xcatd daemon for client/server communication)\n\n".
" xcatiport - (port used by xcatd to receive install status updates from nodes)\n\n".
" timezone - (e.g. America/New_York)\n\n".
" nameservers - (comma delimited list of DNS servers for the cluster - often the mgmt node)\n\n".
" ntpservers - (comma delimited list of NTP servers for the cluster - often the mgmt node)\n\n".
" useSSHonAIX -(yes/1 or no/0). If yes, ssh/scp will be setup and used. If no, rsh/rcp will be setup and used on AIX.\n\n".
" blademaxp - (max # of processes for blade hw ctrl)\n\n".
" ppcmaxp - (max # of processes for PPC hw ctrl)\n\n".
" ipmimaxp - (max # of processes for ipmi hw ctrl)\n\n".
" ipmitimeout - (the timeout to use when communicating with BMCs)\n\n".
" ipmiretries - (the # of retries to use when communicating with BMCs)\n\n".
" ipmisdrcache -\n\n".
" iscsidir - (the path to put the iscsi disks in on the mgmt node)\n\n".
" xcatservers - (Deprecated! Will be replaced by the servicenode table. List service nodes)\n\n".
" svloglocal - (syslog on the service node does not get forwarded to the mgmt node - default is 0)\n\n".
" consoleondemand - (when set to 'yes', it connects and creates the console output only when the user opens the console)\n\n".
" dhcpinterfaces - (network interfaces DHCP should listen on. If same for all nodes, use simple comma-separated list of NICs. Also support: mn|eth1,eth2;service|bond0;compute|eth0)\n\n".
" forwarders - (DNS servers at your site that can provide names outside of the cluster)\n\n".
" genpasswords - (automatically generate random passwords for BMCs when configuring them)\n\n".
" defserialport - (default serial port - currently only used by mknb)\n\n".
" defserialspeed - (default serial speed - currently only used by mknb)\n\n".
" defserialflow - (default serial flow - currently only used by mknb)\n\n".
" ppctimeout - (the timeout, in milliseconds, to use when communicating with PPC hw)\n\n".
" maxssh - (max # of SSH connections for hw ctrl purposes to PPC hw)\n\n".
" ppcretry - (max # of PPC hw connection attempts before failing)\n\n".
" fsptimeout - (the timeout, in milliseconds, to use when communicating with FSPs)\n\n",
value => 'The value of the attribute specified in the "key" column.',
comments => 'Any user-written notes.',
disable => "Set to 'yes' or '1' to comment out this row.",
@@ -702,7 +702,6 @@ foreach my $tabname (keys(%xCAT::ExtTab::ext_tabspec)) {
network => { attrs => [], attrhash => {}, objkey => 'netname' },
group => { attrs => [], attrhash => {}, objkey => 'groupname' },
site => { attrs => [], attrhash => {}, objkey => 'master' },
#site => { attrs => [], attrhash => {}, objkey => 'sitename' },
policy => { attrs => [], attrhash => {}, objkey => 'priority' },
monitoring => { attrs => [], attrhash => {}, objkey => 'name' },
notification => { attrs => [], attrhash => {}, objkey => 'filename' },
@@ -1417,43 +1416,6 @@ push(@{$defspec{node}->{'attrs'}}, @nodeattrs);
access_tabentry => 'site.key=str:xcatdport',
description => 'Port used by xcatd daemon on master'},
);
#@{$defspec{site}->{'attrs'}} = (
# {attr_name => 'sitename',
# tabentry => 'site.sitename',
# access_tabentry => 'site.sitename=attr:sitename',
# description => 'Name of this xCAT cluster site definition.'},
# {attr_name => 'master',
# tabentry => 'site.master',
# access_tabentry => 'site.sitename=attr:sitename',
# description => 'The name of the xCAT management node.'},
# {attr_name => 'domain',
# tabentry => 'site.domain',
# access_tabentry => 'site.sitename=attr:sitename',
# description => 'The DNS domain name for this cluster.'},
# {attr_name => 'installdir',
# tabentry => 'site.installdir',
# access_tabentry => 'site.sitename=attr:sitename',
# description => 'The installation directory.'},
# {attr_name => 'rsh',
# tabentry => 'site.rsh',
# access_tabentry => 'site.sitename=attr:sitename',
# description => 'Specifies the path of the remote shell command to use.'},
# {attr_name => 'rcp',
# tabentry => 'site.rcp',
# access_tabentry => 'site.sitename=attr:sitename',
# description => 'Specifies the path of the remote copy command to use.'},
# {attr_name => 'xcatdport',
# tabentry => 'site.xcatdport',
# access_tabentry => 'site.sitename=attr:sitename',
# description => 'The port used by xcatd daemon running on the xCAT management node.'},
# {attr_name => 'usercomment',
# tabentry => 'site.comments',
# access_tabentry => 'site.sitename=attr:sitename',
# description => 'User comment.'},
# );
#######################
# groups data object #
#######################

31
xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
View File

@@ -433,21 +433,26 @@ sub processArgs
# give the list of attr names for each type specified
foreach my $t (@::clobjtypes)
{
if ($t eq 'site')
{
my $rsp;
$rsp->{data}->[0] =
"\nThere can only be one site definition. The name of the site definition is \'clustersite\'. This definiton consists of an unlimited list of user-defined attributes and values. Some specific attribute values are required to support xCAT features. See the xCAT documentation for more information.\n";
xCAT::MsgUtils->message("I", $rsp, $::callback);
next;
}
my $rsp;
$rsp->{data}->[0] = "The valid attribute names for object type '$t' are:\n";
# get the data type definition from Schema.pm
if ($t eq 'site') {
my $schema = xCAT::Table->getTableSchema('site');
my $desc;
$rsp->{data}->[0] = "\nThere can only be one site definition. The name of the \nsite definition is \'clustersite\'. This definiton consists of an \nunlimited list of user-defined attributes and values. Some specific attribute \nvalues are required to support xCAT features. The following is a list \nof the attributes currently used by xCAT.\n";
$desc = $schema->{descriptions}->{'key'};
$rsp->{data}->[1] = $desc;
xCAT::MsgUtils->message("I", $rsp, $::callback);
next;
}
# get the data type definition from Schema.pm
my $datatype = $xCAT::Schema::defspec{$t};
$rsp->{data}->[0] = "The valid attribute names for object type '$t' are:\n";
# get the objkey for this type object (ex. objkey = 'node')
my $objkey = $datatype->{'objkey'};
@@ -2389,7 +2394,7 @@ sub defls
next;
}
if ($myhash{$obj}{$showattr})
if (exists($myhash{$obj}{$showattr}))
{
my $rsp;
$rsp->{data}->[0] =
@@ -2461,7 +2466,7 @@ sub defls
}
my $attrval;
if ( defined($defhash{$obj}{$showattr}))
if ( exists($defhash{$obj}{$showattr}))
{
$attrval = $defhash{$obj}{$showattr};
}