arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rework message when uuid is not available to be less severe

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8858 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso
2011-02-16 15:51:08 +00:00
parent 2c9e58f954
commit bea95cbe38
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
perl-xCAT/xCAT/Client.pm
View File

@@ -967,6 +967,10 @@ sub handle_response {
$desc.=": Error: ".$node->{error}->[0];
$errflg=1;
}
if ($node->{warning}) {
$desc.=": Warning: ".$node->{warning}->[0];
$errflg=1;
}
if ($node->{data}) {
if (ref(\($node->{data}->[0])) eq 'SCALAR') {
$desc=$desc.": ".$node->{data}->[0];

5
xCAT-server/lib/xcat/plugins/dhcp.pm
View File

@@ -152,14 +152,13 @@ sub addnode6 {
#omshell to add host dynamically
my $node = shift;
unless ($vpdhash) {
$callback->({error => ["Unable to open vpd table, it may not exist yet"], errorcode => [1] });
$callback->({node=>{name=>[$node],warning => ["Skipping DHCPv6 setup due to missing vpd.uuid information."]}});
return;
}
my $ent = $vpdhash->{$node}->[0]; #tab->getNodeAttribs($node, [qw(mac)]);
unless ($ent and $ent->{uuid})
{
print Dumper($vpdhash);
$callback->( { error => ["Unable to find UUID for $node"], errorcode => [1] });
$callback->({node=>{name=>[$node],warning => ["Skipping DHCPv6 setup due to missing vpd.uuid information."]}});
return;
}
#phase 1, dynamic and static addresses, hopefully ddns-hostname works, may be tricky to do 'send hostname'