Commit bd93f027 authored by Leigh Stoller's avatar Leigh Stoller

Kill call to ipassign_wrapper, we ignore the results, and it can throw

an error in some situations. Also increase limit on XEN core from 4 to 12.
parent aa4afa57
......@@ -2160,11 +2160,11 @@ sub GetTicketAuxAux($)
# ignore silly user.
next;
}
if ($isshared && $attrvalue > 4) {
if ($isshared && $attrvalue > 12) {
$response =
GeniResponse->Create(GENIRESPONSE_BADARGS, undef,
"Bad XEN setting; ".
"limited to 1-4 cores");
"limited to 1-12 cores");
goto bad;
}
}
......@@ -3389,6 +3389,7 @@ sub GetTicketAuxAux($)
goto bad;
}
if (0) {
# Do IP assignment.
DebugTimeStamp("Starting ipassign");
my $poutput = GeniUtil::ExecQuiet("$IPASSIGN $pid $eid");
......@@ -3399,6 +3400,7 @@ sub GetTicketAuxAux($)
goto bad;
}
DebugTimeStamp("Finished ipassign");
}
# Allocate any public address pools.
my $tmp = $slice_experiment->AllocatePublicAddrPools();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment