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

Synched up zVM code with ones in trunk

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@13082 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
phamt 2012-06-13 18:38:35 +00:00
parent e7fb61e2ba
commit 61001a5e40
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
xCAT-server/lib/xcat/plugins/zvm.pm
View File

@ -3215,19 +3215,14 @@ sub nodeSet {
$userId =~ tr/a-z/A-Z/;
# Get install directory and domain from site table
#my $siteTab = xCAT::Table->new('site');
#my $installDirHash = $siteTab->getAttribs( { key => "installdir" }, 'value' );
my @entries = xCAT::Utils->get_site_attribute("installdir");
my $installDir = $entries[0];
#my $domainHash = $siteTab->getAttribs( { key => "domain" }, 'value' );
@entries = xCAT::Utils->get_site_attribute("domain");
my $domain = $entries[0];
#my $masterHash = $siteTab->getAttribs( { key => "master" }, 'value' );
@entries = xCAT::Utils->get_site_attribute("master");
my $master = $entries[0];
#my $xcatdPortHash = $siteTab->getAttribs( { key => "xcatdport" }, 'value' );
@entries = xCAT::Utils->get_site_attribute("xcatdport");
my $xcatdPort = $entries[0];
my $installDir = $entries[0];
@entries = xCAT::Utils->get_site_attribute("domain");
my $domain = $entries[0];
@entries = xCAT::Utils->get_site_attribute("master");
my $master = $entries[0];
@entries = xCAT::Utils->get_site_attribute("xcatdport");
my $xcatdPort = $entries[0];
# Get node OS, arch, and profile from 'nodetype' table
@propNames = ( 'os', 'arch', 'profile' );
@ -4308,10 +4303,8 @@ sub updateNode {
$userId =~ tr/a-z/A-Z/;
# Get install directory
#my $siteTab = xCAT::Table->new('site');
#my $installDirHash = $siteTab->getAttribs( { key => "installdir" }, 'value' );
my @entries = xCAT::Utils->get_site_attribute("installdir");
my $installDir = $entries[0];
my @entries = xCAT::Utils->get_site_attribute("installdir");
my $installDir = $entries[0];
# Get host IP and hostname from /etc/hosts
my $out = `cat /etc/hosts | grep $node`;