From f196c720ef8da1227f0512d53820b74cfb82c390 Mon Sep 17 00:00:00 2001 From: mellor Date: Tue, 8 Apr 2014 17:14:37 -0400 Subject: [PATCH] defect 4049 change Postage.pm to call my_if_facing if xcatmaster attr not set --- xCAT-server/lib/perl/xCAT/Postage.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xCAT-server/lib/perl/xCAT/Postage.pm b/xCAT-server/lib/perl/xCAT/Postage.pm index 38592ee06..a8a1d8633 100644 --- a/xCAT-server/lib/perl/xCAT/Postage.pm +++ b/xCAT-server/lib/perl/xCAT/Postage.pm @@ -1392,7 +1392,9 @@ sub collect_all_attribs_for_tables_in_template $::GLOBAL_TAB_HASH{$tabname}{$node}{$attrib} = $ent->{$node}->[0]->{$attrib}; #for noderes.xcatmaster - if ($tabname =~ /^noderes$/ && $attrib =~ /^xcatmaster$/ && ! exists($::GLOBAL_TAB_HASH{noderes}{$node}{xcatmaster})) + if ($tabname =~ /^noderes$/ && $attrib =~ /^xcatmaster$/ && + ( ! exists($::GLOBAL_TAB_HASH{noderes}{$node}{xcatmaster}) || + $::GLOBAL_TAB_HASH{noderes}{$node}{xcatmaster} == "" ) ) { my $value; $value = xCAT::NetworkUtils->my_ip_facing($node);