Commit bc207167 authored by Kirk Webb's avatar Kirk Webb

Send "BOOTING" event after rebooting externally managed nodes.

Also quiet down the EmulabFeatures library where we are using it
to detect external management.  Too many "checking for feature ..."
messages.
parent b6956f3d
......@@ -73,6 +73,9 @@ use Experiment;
use EmulabFeatures;
use EmulabConstants;
# Tell EmulabFeatures to shut its yap
$EmulabFeatures::verbose = 0;
#
# PXE boot constants
#
......
......@@ -296,6 +296,7 @@ if ($need_consetup && !$error && @nodes) {
TBDebugTimeStamp("nalloc finished console setup");
}
$EmulabFeatures::verbose = 0;
if (EmulabFeatures->FeatureEnabled("ExternalNodeManagement",
undef, undef,
$experiment)) {
......
......@@ -211,6 +211,7 @@ else {
# Trigger a remake of the dhcpd.conf file for any experiment marked
# with the ExternalNodeManagement feature.
#
$EmulabFeatures::verbose = 0;
if (EmulabFeatures->FeatureEnabled("ExternalNodeManagement",
undef, undef,
$experiment)) {
......
......@@ -79,6 +79,9 @@ use User;
use Node;
use EmulabFeatures;
# Simmer down EmulabFeatures!
$EmulabFeatures::verbose = 0;
# Is this needed any longer?
my $dolastload = 0;
......@@ -398,6 +401,15 @@ while (1) {
$count++;
}
# XXX: Poke at stated to move along nodes that are going to be
# externally managed. This feels kind of kludgy.
if (EmulabFeatures->FeatureEnabled("ExternalNodeManagement",
undef, undef, $experiment)) {
foreach my $node (@nodes) {
$node->SetEventState(TBDB_NODESTATE_BOOTING());
}
}
# And wait.
print STDERR "Waiting for nodes ...\n";
$MyStruct->WaitForNodes(@nodes);
......
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