From 6210e77baa38d1e695656880cd3b0eeebc2ad5ee Mon Sep 17 00:00:00 2001 From: bp-sawyers Date: Thu, 22 May 2008 13:01:40 +0000 Subject: [PATCH] changed installoc to more correctly be installloc git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1477 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT-2.0/xCAT/Schema.pm | 31 ++++++++++--------- xCAT-server-2.0/lib/xcat/plugins/AAsn.pm | 38 ++++++++++++------------ 2 files changed, 34 insertions(+), 35 deletions(-) diff --git a/perl-xCAT-2.0/xCAT/Schema.pm b/perl-xCAT-2.0/xCAT/Schema.pm index 84c9e77b7..4802c08d6 100644 --- a/perl-xCAT-2.0/xCAT/Schema.pm +++ b/perl-xCAT-2.0/xCAT/Schema.pm @@ -166,7 +166,7 @@ networks => { tftpserver => 'The TFTP server that is servicing this network.', nameservers => 'The nameservers for this network. Used in creating the DHCP network definition, and DNS configuration.', dynamicrange => 'The IP address range used by DHCP to assign dynamic IP addresses for requests on this network.', - nodehostname => '??', + nodehostname => 'Not Used??', comments => 'Any user-written notes.', disable => "Set to 'yes' or '1' to comment out this row.", }, @@ -404,31 +404,30 @@ site => { " master (xCAT management node)\n". " xcatconfdir (default /etc/xcat)\n". " domain (DNS domain name used for the cluster)\n". - " installdir (directory that holds the node deployment pkgs)\n". - " installoc (location of the installdir directory,format hostname:/path)\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". " 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)\n". - " ntpservers (comma delimited list of NTP servers for the cluster)\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". " rsh (path of remote shell command)\n". " rcp (path of remote copy command)\n". " blademaxp (max # of processes for blade hw ctrl)\n". " ppcmaxp (max # of processes for PPC hw ctrl)\n". - " ipmimaxp\n". - " ipmitimeout\n". - " ipmiretries\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\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 (logs on the service node stay local or not. 1 or 0)\n". - " dhcpinterfaces (network interfaces DHCP should listen on. We are thinking of also supporting: mn:eth1,eth2;sn1:bond0;sn2:bond0)\n". + " svloglocal (syslog on the service node does not get forwarded to the mgmt node - default is 0)\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 (generate BMC passwords??)\n". - " defserialport (default if not specified in noderes table)\n". - " defserialspeed (default if not specified in nodehm table)\n". - " defserialflow (default if not specified in nodehm table)". - " svloglocal (service node logs to the local host. default forwards to the managment node)", + " genpasswords (automatically generate random passwords for BMCs when configuring them)\n". + " defserialport (default if not specified for the node in nodehm table)\n". + " defserialspeed (default if not specified for the node in nodehm table)\n". + " defserialflow (default if not specified for the node in nodehm table)\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.", diff --git a/xCAT-server-2.0/lib/xcat/plugins/AAsn.pm b/xCAT-server-2.0/lib/xcat/plugins/AAsn.pm index 3a4bc7736..78e57199f 100644 --- a/xCAT-server-2.0/lib/xcat/plugins/AAsn.pm +++ b/xCAT-server-2.0/lib/xcat/plugins/AAsn.pm @@ -12,17 +12,17 @@ use Getopt::Long; #------------------------------------------------------- -=head1 - - mounts /install if site->installoc set +=head1 + + mounts /install if site.installloc set #------------------------------------------------------- -=head3 handled_commands +=head3 handled_commands Check to see if on a Service Node -Call mountInstall +Call mountInstall =cut @@ -57,7 +57,7 @@ sub handled_commands #------------------------------------------------------- -=head3 process_request +=head3 process_request Process the command @@ -71,10 +71,10 @@ sub process_request #----------------------------------------------------------------------------- -=head3 mountInstall +=head3 mountInstall - if site->installoc attribute set - mount the install directory + if site.installloc attribute set + mount the install directory =cut @@ -84,7 +84,7 @@ sub mountInstall my ($nodename) = @_; my $rc = 0; my $installdir = "/install"; # default - my $installoc = "/install"; # default + my $installloc = "/install"; # default # read DB for nodeinfo my $master; @@ -101,19 +101,19 @@ sub mountInstall # read install directory and install location from database, # if they exists - my @installocation= xCAT::Utils->get_site_attribute("installoc"); + my @installlocation= xCAT::Utils->get_site_attribute("installloc"); my $hostname; my $path; - if ($installocation[0]) + if ($installlocation[0]) { - if (grep /:/, $installocation[0]){ - my ($hostname, $installoc) = split ":",$installocation[0]; + if (grep /:/, $installlocation[0]){ + my ($hostname, $installloc) = split ":",$installlocation[0]; if ($hostname) - { # hostname set in /installoc attribute + { # hostname set in /installloc attribute $master = $hostname; # set name for mount } } else { - $installoc=$installocation[0]; + $installloc=$installlocation[0]; } } else @@ -140,7 +140,7 @@ sub mountInstall { # not mounted # need to mount the directory - my $cmd= "mount -o rw,nolock $master:$installoc $installdir"; + my $cmd= "mount -o rw,nolock $master:$installloc $installdir"; system $cmd; if ($? > 0) { # error @@ -159,11 +159,11 @@ sub mountInstall { # update fstab to mount on reboot - $cmd = "grep $master:$installoc $installdir /etc/fstab "; + $cmd = "grep $master:$installloc $installdir /etc/fstab "; xCAT::Utils->runcmd($cmd, -1); if ($::RUNCMD_RC != 0) { - `echo "$master:$installoc $installdir nfs timeo=14,intr 1 2" >>/etc/fstab`; + `echo "$master:$installloc $installdir nfs timeo=14,intr 1 2" >>/etc/fstab`; } } return $rc;