From 42af194434c900084c83b9edd1456dbcc8cf2503 Mon Sep 17 00:00:00 2001 From: lissav Date: Fri, 13 Sep 2013 08:00:12 -0400 Subject: [PATCH] defect 3750 --- xCAT-server/lib/xcat/plugins/pxe.pm | 4 +++- xCAT-server/lib/xcat/plugins/vsmppxe.pm | 10 +++++++--- xCAT-server/lib/xcat/plugins/xnba.pm | 4 +++- xCAT-server/lib/xcat/plugins/yaboot.pm | 4 +++- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/pxe.pm b/xCAT-server/lib/xcat/plugins/pxe.pm index b5d947b56..8fadc1e3e 100644 --- a/xCAT-server/lib/xcat/plugins/pxe.pm +++ b/xCAT-server/lib/xcat/plugins/pxe.pm @@ -346,7 +346,9 @@ sub preprocess_request { if ($req->{inittime}->[0]) { return [$req]; } - return xCAT::Scope->get_broadcast_scope($req,@_); + if (@CN >0 ) { # if compute nodes broadcast to all servicenodes + return xCAT::Scope->get_broadcast_scope($req,@_); + } } return [$req]; } diff --git a/xCAT-server/lib/xcat/plugins/vsmppxe.pm b/xCAT-server/lib/xcat/plugins/vsmppxe.pm index f40655eb5..8bf893bf8 100644 --- a/xCAT-server/lib/xcat/plugins/vsmppxe.pm +++ b/xCAT-server/lib/xcat/plugins/vsmppxe.pm @@ -2,13 +2,15 @@ package xCAT_plugin::vsmppxe; use Data::Dumper; use Sys::Syslog; +use xCAT::Scope; +use xCAT::Utils; +use xCAT::NetworkUtils; use Socket; use File::Copy; use Getopt::Long; use xCAT::MsgUtils; use xCAT::ServiceNodeUtils; - -use xCAT::TableUtils qw(get_site_attribute); +use xCAT::TableUtils; my $addkcmdlinehandled; my $request; my $callback; @@ -276,7 +278,9 @@ sub preprocess_request { if ($req->{inittime}->[0]) { return [$req]; } - return xCAT::Scope->get_broadcast_scope($req,@_); + if (@CN >0 ) { # if there are compute nodes then broadcast to any servicenodes + return xCAT::Scope->get_broadcast_scope($req,@_); + } } return [$req]; } diff --git a/xCAT-server/lib/xcat/plugins/xnba.pm b/xCAT-server/lib/xcat/plugins/xnba.pm index 65ed1298c..4fdaffb1f 100644 --- a/xCAT-server/lib/xcat/plugins/xnba.pm +++ b/xCAT-server/lib/xcat/plugins/xnba.pm @@ -366,7 +366,9 @@ sub preprocess_request { if ($req->{inittime}->[0]) { return [$req]; } - return xCAT::Scope->get_broadcast_scope($req,@_); + if (@CN >0 ) { # if compute nodes broadcast to all servicenodes + return xCAT::Scope->get_broadcast_scope($req,@_); + } } return [$req]; } diff --git a/xCAT-server/lib/xcat/plugins/yaboot.pm b/xCAT-server/lib/xcat/plugins/yaboot.pm index 2988a926a..2ee83de4e 100644 --- a/xCAT-server/lib/xcat/plugins/yaboot.pm +++ b/xCAT-server/lib/xcat/plugins/yaboot.pm @@ -397,7 +397,9 @@ sub preprocess_request { if ($req->{inittime}->[0]) { return [$req]; } - return xCAT::Scope->get_broadcast_scope($req,@_); + if (@CN >0 ) { # if compute nodes broadcast to all servicenodes + return xCAT::Scope->get_broadcast_scope($req,@_); + } } return [$req]; }