From 777729759d6c2f075a9e0903b291d038feebb470 Mon Sep 17 00:00:00 2001 From: jjhua Date: Thu, 1 Nov 2012 02:57:05 +0000 Subject: [PATCH] pre-create mypostscript enhancement: use the global variable %::GLOBAL_SN_HASH in enablessh() git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14189 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/TableUtils.pm | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/perl-xCAT/xCAT/TableUtils.pm b/perl-xCAT/xCAT/TableUtils.pm index 91f936706..71c8b010e 100644 --- a/perl-xCAT/xCAT/TableUtils.pm +++ b/perl-xCAT/xCAT/TableUtils.pm @@ -1500,12 +1500,19 @@ sub enablessh my ($class, $node) = @_; my $enablessh=1; - if (xCAT::Utils->isSN($node)) - { - $enablessh=1; # service nodes always enabled - } - else - { + + if( defined(%::GLOBAL_SN_HASH) ) { + if ($::GLOBAL_SN_HASH{$node} == 1) { + $enablessh=1; # service nodes always enabled + + } + } else { + if (xCAT::Utils->isSN($node)) + { + $enablessh=1; # service nodes always enabled + } + else + { # if not a service node we need to check, before enabling my $values; @@ -1544,14 +1551,14 @@ sub enablessh } } } - } - else - { # does not exist, set default + } + else + { # does not exist, set default $enablessh=1; - } + } + } } - return $enablessh; }