From 9627e68cf3cecff811a870dd475f95946d8397e4 Mon Sep 17 00:00:00 2001 From: lissav Date: Wed, 28 Sep 2011 11:31:53 +0000 Subject: [PATCH] changing setting of nimprime to support Linux/AIX mixed clusters git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10657 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/Utils.pm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/perl-xCAT/xCAT/Utils.pm b/perl-xCAT/xCAT/Utils.pm index 32f437939..368288346 100644 --- a/perl-xCAT/xCAT/Utils.pm +++ b/perl-xCAT/xCAT/Utils.pm @@ -3648,13 +3648,12 @@ sub get_ServiceNode my $master = xCAT::Utils->get_site_Master(); # read the site table, master attrib + # need better logic here for MIXED CLUSTERS + # the NIM primary will be either the site.NIMprime attr + # or, if not set, the site.master attr my $nimprime; - if (xCAT::Utils->isAIX()) { - # for AIX nodes the NIM primary will be either the site.NIMprime attr - # or, if not set, the site.master attr - $nimprime = xCAT::InstUtils->getnimprime(); - chomp $nimprime; - } + $nimprime = xCAT::InstUtils->getnimprime(); + chomp $nimprime; # $master and $nimprime is possible to be the same (MN) # but $master is IP addr, $nimprime is short hostname