Commit 8d12cd58 authored by Leigh B. Stoller's avatar Leigh B. Stoller
Browse files

Both blind and dumb, thats me!

parent fff92262
...@@ -343,7 +343,7 @@ sub osload ($$) { ...@@ -343,7 +343,7 @@ sub osload ($$) {
# This is passed along so that remote node can request the file. # This is passed along so that remote node can request the file.
# Make sure the image object has an access key defined. # Make sure the image object has an access key defined.
if ($nodeobject->isremotenode() !defined($access_key)) { if ($nodeobject->isremotenode() && !defined($access_key)) {
$access_key = TBGenSecretKey(); $access_key = TBGenSecretKey();
$rowref->{'access_key'} = $access_key; $rowref->{'access_key'} = $access_key;
...@@ -366,7 +366,7 @@ sub osload ($$) { ...@@ -366,7 +366,7 @@ sub osload ($$) {
'osid' => $defosid, 'osid' => $defosid,
'reboot' => $reboot_required, 'reboot' => $reboot_required,
'zerofree'=> $zerofree, 'zerofree'=> $zerofree,
'maxwait' => $maxwait, 'maxwait' => $maxwait
}; };
print "Setting up reload for $node (mode: $reload_mode)\n"; print "Setting up reload for $node (mode: $reload_mode)\n";
...@@ -383,7 +383,7 @@ sub osload ($$) { ...@@ -383,7 +383,7 @@ sub osload ($$) {
$result->{$node} = -1; $result->{$node} = -1;
$failures++; $failures++;
} }
# #
# Remove any failed nodes from the list we are going to operate on. # Remove any failed nodes from the list we are going to operate on.
# #
...@@ -525,7 +525,6 @@ sub osload ($$) { ...@@ -525,7 +525,6 @@ sub osload ($$) {
close(CHILD_WRITER); close(CHILD_WRITER);
exit($failures); exit($failures);
} }
return $failures; return $failures;
} }
......
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