Commit bf7c10c6 authored by Kevin Atkinson's avatar Kevin Atkinson

Fix "* nodes are down" message be be from the real users email address

rather than "USER@boss.emulab.net".  The reason they where from
USER@boss.emulab.net is because they the script was being run as USER.
I just added the "From:" header to the email.
parent e3f782c6
...@@ -580,7 +580,8 @@ if ($firewalled) { ...@@ -580,7 +580,8 @@ if ($firewalled) {
" $node\n". " $node\n".
"in pid/eid $pid/$eid appears to be dead.\n\n". "in pid/eid $pid/$eid appears to be dead.\n\n".
"The node has been taken out of the pool until this matter ". "The node has been taken out of the pool until this matter ".
"is resolved.\n"); "is resolved.\n",
$user_email_to);
$failed++; $failed++;
add_failed_node_fatal($node); add_failed_node_fatal($node);
...@@ -622,7 +623,8 @@ if ($plabinelab) { ...@@ -622,7 +623,8 @@ if ($plabinelab) {
"Node:\n". "Node:\n".
" $node\n". " $node\n".
"in pid/eid $pid/$eid failed to boot after loading OS.\n\n". "in pid/eid $pid/$eid failed to boot after loading OS.\n\n".
"The nodes have been freed.\n"); "The nodes have been freed.\n",
$user_email_to);
$failed++; $failed++;
add_failed_node_fatal($node); add_failed_node_fatal($node);
goto tballdone; goto tballdone;
...@@ -974,7 +976,8 @@ if ($count > 0) { ...@@ -974,7 +976,8 @@ if ($count > 0) {
" " . join(" ", @informtbopsfatal) . "\n". " " . join(" ", @informtbopsfatal) . "\n".
"in pid/eid $pid/$eid appear to be dead.\n\n". "in pid/eid $pid/$eid appear to be dead.\n\n".
"The nodes have been taken out of the pool until this matter ". "The nodes have been taken out of the pool until this matter ".
"is resolved.\n"); "is resolved.\n",
$user_email_to);
} }
$count = scalar(@informtbopswarn); $count = scalar(@informtbopswarn);
if ($count > 0) { if ($count > 0) {
...@@ -982,7 +985,8 @@ if ($count > 0) { ...@@ -982,7 +985,8 @@ if ($count > 0) {
"Nodes:\n". "Nodes:\n".
" " . join(" ", @informtbopswarn) . "\n". " " . join(" ", @informtbopswarn) . "\n".
"in pid/eid $pid/$eid failed to boot after loading OS.\n\n". "in pid/eid $pid/$eid failed to boot after loading OS.\n\n".
"The nodes have been freed.\n"); "The nodes have been freed.\n",
$user_email_to);
} }
TBDebugTimeStamp("Local node waiting finished"); TBDebugTimeStamp("Local node waiting finished");
......
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