From 27c4bcbbe4d97f928a1b46d484dbf0c87f6fea8a Mon Sep 17 00:00:00 2001 From: sjing Date: Tue, 10 May 2011 08:36:19 +0000 Subject: [PATCH] support keyword in site/networks table. git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9538 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/zvm.pm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/xCAT-server/lib/xcat/plugins/zvm.pm b/xCAT-server/lib/xcat/plugins/zvm.pm index f40784547..6464581ba 100644 --- a/xCAT-server/lib/xcat/plugins/zvm.pm +++ b/xCAT-server/lib/xcat/plugins/zvm.pm @@ -3092,7 +3092,18 @@ sub nodeSet { my $mask = $propVals->{'mask'}; my $gateway = $propVals->{'gateway'}; my $ftp = $propVals->{'tftpserver'}; - my $nameserver = $propVals->{'nameservers'}; + + # convert to nameserver IP + my $nameserver; + if ($propVals->{'nameservers'} eq '') + { + $nameserver = xCAT::InstUtils->convert_xcatmaster(); + } + else + { + $nameserver = $propVals->{'nameservers'}; + } + if ( !$network || !$mask || !$ftp || !$nameserver ) { # It is acceptable to not have a gateway