From f17e5447dbe5366e79b6a320db57b3b667d5a4cd Mon Sep 17 00:00:00 2001 From: lissav Date: Tue, 6 May 2008 15:42:57 +0000 Subject: [PATCH] Change Service Node plugins for new servicenode table interface git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1290 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server-2.0/lib/xcat/plugins/CONSsn.pm | 2 +- xCAT-server-2.0/lib/xcat/plugins/DNSsn.pm | 2 +- xCAT-server-2.0/lib/xcat/plugins/NFSsn.pm | 2 +- xCAT-server-2.0/lib/xcat/plugins/TFTPsn.pm | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-server-2.0/lib/xcat/plugins/CONSsn.pm b/xCAT-server-2.0/lib/xcat/plugins/CONSsn.pm index 753bfc039..d47b996e6 100644 --- a/xCAT-server-2.0/lib/xcat/plugins/CONSsn.pm +++ b/xCAT-server-2.0/lib/xcat/plugins/CONSsn.pm @@ -40,7 +40,7 @@ sub handled_commands my $nodename = pop @nodeinfo; # get hostname my @nodeipaddr = @nodeinfo; # get ip addresses - my $service = "cons"; + my $service = "conserver"; $rc = xCAT::Utils->isServiceReq($nodename, $service, \@nodeipaddr); if ($rc == 1) { diff --git a/xCAT-server-2.0/lib/xcat/plugins/DNSsn.pm b/xCAT-server-2.0/lib/xcat/plugins/DNSsn.pm index fc53d0a11..69532c9e5 100644 --- a/xCAT-server-2.0/lib/xcat/plugins/DNSsn.pm +++ b/xCAT-server-2.0/lib/xcat/plugins/DNSsn.pm @@ -35,7 +35,7 @@ sub handled_commands my @nodeinfo = xCAT::Utils->determinehostname; my $nodename = pop @nodeinfo; # get hostname my @nodeipaddr = @nodeinfo; # get ip addresses - my $service = "nameservers"; + my $service = "nameserver"; $rc = xCAT::Utils->isServiceReq($nodename, $service, \@nodeipaddr); if ($rc == 1) diff --git a/xCAT-server-2.0/lib/xcat/plugins/NFSsn.pm b/xCAT-server-2.0/lib/xcat/plugins/NFSsn.pm index 48d907ef6..0a3a5c437 100644 --- a/xCAT-server-2.0/lib/xcat/plugins/NFSsn.pm +++ b/xCAT-server-2.0/lib/xcat/plugins/NFSsn.pm @@ -40,7 +40,7 @@ sub handled_commands my @nodeipaddr = @nodeinfo; # get ip addresses my $service = "nfsserver"; $rc = xCAT::Utils->isServiceReq($nodename, $service, \@nodeipaddr); - if ($rc == 1 || $rc == 0) # for now always mount install + if ($rc == 1) { # service needed on this Service Node diff --git a/xCAT-server-2.0/lib/xcat/plugins/TFTPsn.pm b/xCAT-server-2.0/lib/xcat/plugins/TFTPsn.pm index 54affecfa..876e5396f 100644 --- a/xCAT-server-2.0/lib/xcat/plugins/TFTPsn.pm +++ b/xCAT-server-2.0/lib/xcat/plugins/TFTPsn.pm @@ -39,7 +39,7 @@ sub handled_commands my $service = "tftpserver"; $rc = xCAT::Utils->isServiceReq($nodename, $service, \@nodeipaddr); - if ($rc == 1 || $rc == 0) # for now always mount tftpboot + if ($rc == 1) { $rc = &setup_TFTP(); # setup TFTP (ATFTP)